Merge branch 'next' of git://git.denx.de/u-boot-video into next
authorWolfgang Denk <wd@denx.de>
Sat, 31 Oct 2009 15:13:18 +0000 (16:13 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 31 Oct 2009 15:13:18 +0000 (16:13 +0100)

Trivial merge