Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Tue, 20 Dec 2011 22:14:37 +0000 (23:14 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 20 Dec 2011 22:14:37 +0000 (23:14 +0100)
commite27334212c919c1e9467408da36f2cd34a8a65be
tree72f8b6d6116e0ee7668c3159d698e9465bafbb9e
parentdeb7282f9ff2b1946628240d0a103f2907b60147
parentc89fd4f0a271d8f7f252266b6591be9ddee53d4e
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