Merge branch 'master' of /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Sat, 7 Aug 2010 20:33:06 +0000 (22:33 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 7 Aug 2010 20:33:06 +0000 (22:33 +0200)

Trivial merge