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

author Tom Rini <trini@ti.com>

Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)

committer Tom Rini <trini@ti.com>

Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)
author Tom Rini <trini@ti.com>
Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)
committer Tom Rini <trini@ti.com>
Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
author	Tom Rini <trini@ti.com>
	Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)
committer	Tom Rini <trini@ti.com>
	Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history