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

author Tom Rini <trini@ti.com>

Sun, 26 Oct 2014 18:12:18 +0000 (14:12 -0400)

committer Tom Rini <trini@ti.com>

Sun, 26 Oct 2014 18:12:18 +0000 (14:12 -0400)
author Tom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:12:18 +0000 (14:12 -0400)
committer Tom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:12:18 +0000 (14:12 -0400)
diff --cc README
Simple merge
diff --cc board/raspberrypi/rpi_b/rpi_b.c
Simple merge
diff --cc include/configs/rpi_b.h
Simple merge
author	Tom Rini <trini@ti.com>
	Sun, 26 Oct 2014 18:12:18 +0000 (14:12 -0400)
committer	Tom Rini <trini@ti.com>
	Sun, 26 Oct 2014 18:12:18 +0000 (14:12 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
board/raspberrypi/rpi_b/rpi_b.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/rpi_b.h	patch \|	diff1 \|	diff2 \|	blob \| history