Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:56:51 +0000 (21:56 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:56:51 +0000 (21:56 +0200)
commit33a08c10c78baf67e41cd03d5732ddc338e8c2e9
tree90c168a7741fc77c3e58c47a48af96cb8278c30e
parentb4039a54153994e7c9a9f1c42a2a70a9153b6587
parenta0152c4ba1ea052df2c3303195d252b86cbfc121
Merge branch 'master' of git://git.denx.de/u-boot-video