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)
commitf12af1f38dc59a6dfe0fed1359e1a05e700a435b
tree2d019236794576f403496d03511c81454921c743
parentf61f59da0fdcec37046680de3972709fe65282ac
parentf550c521e123f2c35d742599f19f4aea2db85951
Merge branch 'master' of git://git.denx.de/u-boot-video