Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:11:55 +0000 (21:11 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:11:55 +0000 (21:11 +0100)

Trivial merge