]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: deb7282 c89fd4f)
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)
* 'master' of /home/wd/git/u-boot/custodians:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function


Trivial merge
Cloned from git://git.denx.de/u-boot.git