Merge branch 'next' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Tue, 5 Oct 2010 12:31:48 +0000 (14:31 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 5 Oct 2010 12:31:48 +0000 (14:31 +0200)

Trivial merge