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

author Tom Rini <trini@ti.com>

Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)

committer Tom Rini <trini@ti.com>

Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)
author Tom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)
committer Tom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc common/board_f.c
Simple merge
diff --cc drivers/video/atmel_lcdfb.c
Simple merge
author	Tom Rini <trini@ti.com>
	Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)
committer	Tom Rini <trini@ti.com>
	Tue, 10 Feb 2015 15:42:22 +0000 (10:42 -0500)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
common/board_f.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/atmel_lcdfb.c	patch \|	diff1 \|	diff2 \|	blob \| history