Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Wed, 7 Dec 2011 08:06:29 +0000 (09:06 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 7 Dec 2011 08:06:29 +0000 (09:06 +0100)
commit9294fd60ae273cc7a2759a48a081a5cc655ddf23
treee1f061c906e6b42f871fa00e2f1038467575ccaa
parent5e1247247b5040081bfc219fe176e43db6ded4cf
parent03d31fcf4c37d90a00e66f06b38742960139f090
Merge branch 'master' of git://git.denx.de/u-boot-video

* 'master' of git://git.denx.de/u-boot-video:
  video: cfb_console: Make the software cursor non-destructive