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

author Tom Rini <trini@ti.com>

Mon, 21 Oct 2013 12:10:36 +0000 (08:10 -0400)

committer Tom Rini <trini@ti.com>

Mon, 21 Oct 2013 12:10:36 +0000 (08:10 -0400)
author Tom Rini <trini@ti.com>
Mon, 21 Oct 2013 12:10:36 +0000 (08:10 -0400)
committer Tom Rini <trini@ti.com>
Mon, 21 Oct 2013 12:10:36 +0000 (08:10 -0400)
diff --cc include/configs/mx6qsabreauto.h
Simple merge
diff --cc include/configs/nitrogen6x.h
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 21 Oct 2013 12:10:36 +0000 (08:10 -0400)
committer	Tom Rini <trini@ti.com>
	Mon, 21 Oct 2013 12:10:36 +0000 (08:10 -0400)
		1	2
include/configs/mx6qsabreauto.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/nitrogen6x.h	patch \|	diff1 \|	diff2 \|	blob \| history