Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Sat, 13 Mar 2010 23:58:30 +0000 (00:58 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 13 Mar 2010 23:58:30 +0000 (00:58 +0100)

Trivial merge