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

author Tom Rini <trini@ti.com>

Mon, 4 Feb 2013 14:07:34 +0000 (09:07 -0500)

committer Tom Rini <trini@ti.com>

Mon, 4 Feb 2013 14:14:22 +0000 (09:14 -0500)
author Tom Rini <trini@ti.com>
Mon, 4 Feb 2013 14:07:34 +0000 (09:07 -0500)
committer Tom Rini <trini@ti.com>
Mon, 4 Feb 2013 14:14:22 +0000 (09:14 -0500)
diff --cc common/cmd_bdinfo.c
Simple merge
diff --cc drivers/block/systemace.c
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 4 Feb 2013 14:07:34 +0000 (09:07 -0500)
committer	Tom Rini <trini@ti.com>
	Mon, 4 Feb 2013 14:14:22 +0000 (09:14 -0500)
		1	2
common/cmd_bdinfo.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/systemace.c	patch \|	diff1 \|	diff2 \|	blob \| history