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-07-23 19:01:36 -07:00
2014-08-06 20:10:32 -07:00
2012-09-05 17:21:36 -07:00
2013-12-09 23:45:39 -08:00
2014-09-23 22:15:18 -07:00
2014-11-10 12:10:24 +09:00
2014-11-03 15:34:00 -08:00
2014-10-08 06:47:31 -04:00