Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Tue, 27 Apr 2010 22:10:41 +0000 (00:10 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 27 Apr 2010 22:10:41 +0000 (00:10 +0200)
commit3699c28e6d16b563629c285311a0ce62a2c4c5d0
treec7fca6782a4563b56e713cac266a400e420a5b74
parentd03f4230a6cc08ac718c876309e4dc425e1a9854
parent7c8cf0d0c7b12c7c63765e936cf760dc2c7d7306
Merge branch 'master' of git://git.denx.de/u-boot-video