git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 19 Oct 2013 20:19:07 +0000 (13:19 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 19 Oct 2013 20:19:07 +0000 (13:19 -0700)
commit	5584cfbafc1a4c2a465f4423d351bb918c64cad0
tree	f74dcc1ba5a6790cb3e69629696aff58bdfd827a	tree \| snapshot (tar.gz zip)
parent	1653d2f88f43f6780eace1faeeb7b7adde8c10fb	commit \| diff
parent	31d141e3a666269a3b6fcccddb0351caf7454240	commit \| diff

Merge 3.12-rc6 into usb-next.

We want those USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap3-beagle-xm.dts	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/pci-quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_core.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	diff2 \|	blob \| history