From: Wolfgang Denk <wd@denx.de>
Date: Tue, 20 Dec 2011 22:14:37 +0000 (+0100)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v2025.01-rc5-pxa1908~18266
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-logo.png?a=commitdiff_plain;h=e27334212c919c1e9467408da36f2cd34a8a65be;p=u-boot.git

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function
---

e27334212c919c1e9467408da36f2cd34a8a65be