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

author Tom Rini <trini@ti.com>

Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)

committer Tom Rini <trini@ti.com>

Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)
author Tom Rini <trini@ti.com>
Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)
committer Tom Rini <trini@ti.com>
Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)
diff --cc config.mk
Simple merge
diff --cc include/configs/am335x_evm.h
Simple merge
author	Tom Rini <trini@ti.com>
	Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)
committer	Tom Rini <trini@ti.com>
	Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)
		1	2
config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/am335x_evm.h	patch \|	diff1 \|	diff2 \|	blob \| history