Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Thu, 9 Sep 2010 19:39:46 +0000 (21:39 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 9 Sep 2010 19:39:46 +0000 (21:39 +0200)

Trivial merge