Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Wed, 24 Mar 2010 13:11:53 +0000 (14:11 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 24 Mar 2010 13:11:53 +0000 (14:11 +0100)

Trivial merge