Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)
1  2 
README
common/Makefile
common/lcd.c

diff --cc README
Simple merge
diff --cc common/Makefile
Simple merge
diff --cc common/lcd.c
Simple merge