Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Tue, 30 Nov 2010 21:12:36 +0000 (22:12 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Nov 2010 21:12:36 +0000 (22:12 +0100)

Trivial merge