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

author Tom Rini <trini@ti.com>

Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)

committer Tom Rini <trini@ti.com>

Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)
author Tom Rini <trini@ti.com>
Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)
committer Tom Rini <trini@ti.com>
Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge
author	Tom Rini <trini@ti.com>
	Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)
committer	Tom Rini <trini@ti.com>
	Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history