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

Trivial merge