git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 10 Nov 2014 03:10:24 +0000 (12:10 +0900)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 10 Nov 2014 03:10:24 +0000 (12:10 +0900)
commit	69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03
tree	f4ad376b3aaf2b68e9066df3885ee8dd297251cb	tree \| snapshot (tar.gz zip)
parent	35a27eab6f94e15fa30f7662af00fbec50526f4a	commit \| diff
parent	206c5f60a3d902bc4b56dab2de3e88de5eb06108	commit \| diff

Merge 3.18-rc4 into usb-next.

This resolves a conflict in drivers/usb/host/Kconfig

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

drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/storage/transport.c	diff1 \|	diff2 \|	blob \| history