Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Tue, 11 Aug 2009 19:47:42 +0000 (21:47 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 11 Aug 2009 19:47:42 +0000 (21:47 +0200)
commitf1da206041e373c88171369e1c6f42c98d77f771
treed7b7a3a6248f303a64ad8b4da0e4c0390ae913b5
parentf45c07dbd185650c1298399cd5b3a31a29cf0e5a
parent54e399f110bbaa24e662e6dd9e88ddb86989d668
Merge branch 'master' of git://git.denx.de/u-boot-video