Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:03:46 +0000 (20:03 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:03:46 +0000 (20:03 +0100)
commit0ae016f1ff6b06e94db52373efd08d106bfcecdf
treeb0ad230adfa839a5829fb7e4083c8706e594b2f6
parentd0750bc9e5932baf4c90eda2456106f21a26bdc1
parenta6e42ed097220a82870a32f4e60ac8863a8b05ab
Merge branch 'master' of git://git.denx.de/u-boot-video