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

author Tom Rini <trini@ti.com>

Fri, 25 Apr 2014 18:53:51 +0000 (14:53 -0400)

committer Tom Rini <trini@ti.com>

Fri, 25 Apr 2014 18:53:51 +0000 (14:53 -0400)
author Tom Rini <trini@ti.com>
Fri, 25 Apr 2014 18:53:51 +0000 (14:53 -0400)
committer Tom Rini <trini@ti.com>
Fri, 25 Apr 2014 18:53:51 +0000 (14:53 -0400)
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
author	Tom Rini <trini@ti.com>
	Fri, 25 Apr 2014 18:53:51 +0000 (14:53 -0400)
committer	Tom Rini <trini@ti.com>
	Fri, 25 Apr 2014 18:53:51 +0000 (14:53 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history