Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Thu, 12 May 2011 17:26:45 +0000 (19:26 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 12 May 2011 17:26:45 +0000 (19:26 +0200)

Trivial merge