Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 21:49:16 +0000 (22:49 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 21:49:16 +0000 (22:49 +0100)

Trivial merge