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

author Tom Rini <trini@ti.com>

Mon, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)

committer Tom Rini <trini@ti.com>

Mon, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)
author Tom Rini <trini@ti.com>
Mon, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)
committer Tom Rini <trini@ti.com>
Mon, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)
diff --cc boards.cfg
Simple merge
diff --cc include/configs/dra7xx_evm.h
Simple merge
diff --cc include/configs/km/keymile-common.h
Simple merge
diff --cc include/configs/km/kmp204x-common.h
Simple merge
diff --cc include/configs/omap5_uevm.h
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)
committer	Tom Rini <trini@ti.com>
	Mon, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)
		1	2
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/dra7xx_evm.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/km/keymile-common.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/km/kmp204x-common.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/omap5_uevm.h	patch \|	diff1 \|	diff2 \|	blob \| history