]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
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)
* '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


Trivial merge