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

author Tom Rini <trini@ti.com>

Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)

committer Tom Rini <trini@ti.com>

Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
author Tom Rini <trini@ti.com>
Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
committer Tom Rini <trini@ti.com>
Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc common/image.c
Simple merge
author	Tom Rini <trini@ti.com>
	Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
committer	Tom Rini <trini@ti.com>
	Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
common/image.c	patch \|	diff1 \|	diff2 \|	blob \| history