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

author Tom Rini <trini@ti.com>

Mon, 14 Oct 2013 15:20:32 +0000 (11:20 -0400)

committer Tom Rini <trini@ti.com>

Mon, 14 Oct 2013 15:20:32 +0000 (11:20 -0400)
author Tom Rini <trini@ti.com>
Mon, 14 Oct 2013 15:20:32 +0000 (11:20 -0400)
committer Tom Rini <trini@ti.com>
Mon, 14 Oct 2013 15:20:32 +0000 (11:20 -0400)
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 14 Oct 2013 15:20:32 +0000 (11:20 -0400)
committer	Tom Rini <trini@ti.com>
	Mon, 14 Oct 2013 15:20:32 +0000 (11:20 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history