Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Thu, 28 Apr 2011 21:45:16 +0000 (23:45 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 28 Apr 2011 21:45:16 +0000 (23:45 +0200)
commit1911602b68f9f6cb2b11dde460aa42d17fb1f700
tree8f6aa78248b08b47582e00548eb5069466e0f82e
parent34d9cb5ec69ce856c3d241d9416620f721d45892
parentba8e76bd49a0575a2442025507882b499856af2b
Merge branch 'master' of git://git.denx.de/u-boot-video