git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

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	a4b746f8c4555bc264f79519632b48b7782ef343
tree	f4ad376b3aaf2b68e9066df3885ee8dd297251cb	tree \| snapshot
parent	30b6ddadc1c719cf94a9e5bcb843e2fdeddcd2d0	commit \| diff
parent	0002cf1d2b453149c8e818e69580694f5a5e90c1	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>

Linux Kernel Source Tree.

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