Merge branch 'master' of git://www.denx.de/git/u-boot-video
authorWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 23:22:05 +0000 (00:22 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 23:22:05 +0000 (00:22 +0100)
commit34d51566bc4fb537da9f833aa67169c79cc69a97
tree5aef7de0373a5fc8b4a57699025b9af149294594
parentc08ba677223131da2bb65b19ff3a2efe72acd72b
parentbed53753dd1d7e6bcbea4339be0fb7760214cc35
Merge branch 'master' of git://denx.de/git/u-boot-video