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

author Tom Rini <trini@ti.com>

Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)

committer Tom Rini <trini@ti.com>

Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)
author Tom Rini <trini@ti.com>
Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)
committer Tom Rini <trini@ti.com>
Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc common/Makefile
Simple merge
author	Tom Rini <trini@ti.com>
	Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)
committer	Tom Rini <trini@ti.com>
	Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
common/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history