Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorWolfgang Denk <wd@denx.de>
Tue, 20 Dec 2011 22:14:32 +0000 (23:14 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 20 Dec 2011 22:14:32 +0000 (23:14 +0100)
commitc89fd4f0a271d8f7f252266b6591be9ddee53d4e
tree6788cca96b28fc173b3f1aaa8622ca4dbf15e7dd
parentbf0b6313433819899c49d8d6fb30b4d702226f1e
parent43d4a5e687fe530d641227910d5e8f1514228eff
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function