Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Thu, 28 Apr 2011 21:45:16 +0000 (23:45 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 28 Apr 2011 21:45:16 +0000 (23:45 +0200)

Trivial merge