Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Wed, 22 Sep 2010 20:37:49 +0000 (22:37 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 22 Sep 2010 20:37:49 +0000 (22:37 +0200)
commit2675244fa4a0c2c3088af279d57dbe8457bacf77
tree86ce127f1a1d6fef7e548815f0e232d76b78c259
parente6e1fb3050351ae96153b1ba6a5bd0a2d745794b
parentc88777e09f77e0b925b001b1a1610b8441b826d8
Merge branch 'master' of git://git.denx.de/u-boot-video