Greg Kroah-Hartman 69b7290e51 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>
2014-11-10 12:10:24 +09:00
..
2014-08-01 15:47:05 -07:00
2014-11-10 12:10:24 +09:00
2014-09-23 22:33:19 -07:00
2014-07-17 17:11:09 -07:00