Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 17 Nov 2010 19:54:39 +0000 (20:54 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 17 Nov 2010 19:54:39 +0000 (20:54 +0100)

Trivial merge