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

author Tom Rini <trini@ti.com>

Thu, 23 Oct 2014 18:05:34 +0000 (14:05 -0400)

committer Tom Rini <trini@ti.com>

Thu, 23 Oct 2014 18:05:34 +0000 (14:05 -0400)
author Tom Rini <trini@ti.com>
Thu, 23 Oct 2014 18:05:34 +0000 (14:05 -0400)
committer Tom Rini <trini@ti.com>
Thu, 23 Oct 2014 18:05:34 +0000 (14:05 -0400)
diff --cc arch/arm/dts/tegra30-colibri.dts
Simple merge
diff --cc include/configs/tegra-common-post.h
Simple merge
diff --cc include/configs/tegra-common.h
Simple merge
author	Tom Rini <trini@ti.com>
	Thu, 23 Oct 2014 18:05:34 +0000 (14:05 -0400)
committer	Tom Rini <trini@ti.com>
	Thu, 23 Oct 2014 18:05:34 +0000 (14:05 -0400)
		1	2
arch/arm/dts/tegra30-colibri.dts	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/tegra-common-post.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/tegra-common.h	patch \|	diff1 \|	diff2 \|	blob \| history