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

author Tom Rini <trini@ti.com>

Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)

committer Tom Rini <trini@ti.com>

Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)
author Tom Rini <trini@ti.com>
Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)
committer Tom Rini <trini@ti.com>
Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)
diff --cc README
Simple merge
diff --cc common/cmd_bootm.c
Simple merge
diff --cc common/image.c
Simple merge
diff --cc include/configs/omap3_beagle.h
Simple merge
diff --cc include/image.h
Simple merge
author	Tom Rini <trini@ti.com>
	Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)
committer	Tom Rini <trini@ti.com>
	Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/image.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_beagle.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/image.h	patch \|	diff1 \|	diff2 \|	blob \| history