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

author Tom Rini <trini@ti.com>

Wed, 11 Jun 2014 00:37:00 +0000 (20:37 -0400)

committer Tom Rini <trini@ti.com>

Wed, 11 Jun 2014 00:37:00 +0000 (20:37 -0400)
author Tom Rini <trini@ti.com>
Wed, 11 Jun 2014 00:37:00 +0000 (20:37 -0400)
committer Tom Rini <trini@ti.com>
Wed, 11 Jun 2014 00:37:00 +0000 (20:37 -0400)
diff --cc README
Simple merge
diff --cc include/configs/cm_t35.h
Simple merge
author	Tom Rini <trini@ti.com>
	Wed, 11 Jun 2014 00:37:00 +0000 (20:37 -0400)
committer	Tom Rini <trini@ti.com>
	Wed, 11 Jun 2014 00:37:00 +0000 (20:37 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/cm_t35.h	patch \|	diff1 \|	diff2 \|	blob \| history