Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Mon, 6 Dec 2010 22:45:35 +0000 (23:45 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 6 Dec 2010 22:45:35 +0000 (23:45 +0100)

Trivial merge