Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@ti.com>
Fri, 7 Jun 2013 12:35:36 +0000 (08:35 -0400)
committerTom Rini <trini@ti.com>
Fri, 7 Jun 2013 12:35:36 +0000 (08:35 -0400)
commit47b8e527448c94d09fc8dbdb6601ea7a605ff955
treeadcd698c960e2001de700b09d7b0ec0a42616aec
parent38d240dcf87923d49607ce2f243a0ac1c62612ca
parentea697ae7eb059d7467c6854ce562c31df510eb59
Merge branch 'master' of git://git.denx.de/u-boot-video
drivers/video/cfb_console.c