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

author Tom Rini <trini@ti.com>

Mon, 26 Nov 2012 21:53:33 +0000 (14:53 -0700)

committer Tom Rini <trini@ti.com>

Mon, 26 Nov 2012 21:53:33 +0000 (14:53 -0700)
author Tom Rini <trini@ti.com>
Mon, 26 Nov 2012 21:53:33 +0000 (14:53 -0700)
committer Tom Rini <trini@ti.com>
Mon, 26 Nov 2012 21:53:33 +0000 (14:53 -0700)
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc include/configs/am3517_evm.h
Simple merge
diff --cc include/configs/mcx.h
Simple merge
diff --cc include/configs/omap3_beagle.h
Simple merge
diff --cc include/configs/tam3517-common.h
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 26 Nov 2012 21:53:33 +0000 (14:53 -0700)
committer	Tom Rini <trini@ti.com>
	Mon, 26 Nov 2012 21:53:33 +0000 (14:53 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/am3517_evm.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mcx.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_beagle.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/tam3517-common.h	patch \|	diff1 \|	diff2 \|	blob \| history