Merge branch 'master' of git://git.denx.de/u-boot-video

author Tom Rini <trini@konsulko.com>

Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)

committer Tom Rini <trini@konsulko.com>

Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)
author Tom Rini <trini@konsulko.com>
Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)
committer Tom Rini <trini@konsulko.com>
Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)
diff --cc README
Simple merge
diff --cc common/Makefile
Simple merge
diff --cc common/lcd.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)
committer	Tom Rini <trini@konsulko.com>
	Mon, 20 Apr 2015 13:13:52 +0000 (09:13 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
common/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/lcd.c	patch \|	diff1 \|	diff2 \|	blob \| history