Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Tue, 27 Apr 2010 22:10:41 +0000 (00:10 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 27 Apr 2010 22:10:41 +0000 (00:10 +0200)

Trivial merge