Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Wed, 19 Jan 2011 21:04:43 +0000 (22:04 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 19 Jan 2011 21:04:43 +0000 (22:04 +0100)

Trivial merge