]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf0b631 43d4a5e)
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
"Das U-Boot" Source Tree