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>

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.h
index 8cd2c4b,d3251eb..ffeb3c8
--- 1/drivers/usb/class/cdc-acm.h
--- 2/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@@ -129,5 -130,7 +130,6 @@@ struct acm 
  #define NO_UNION_NORMAL                       BIT(0)
  #define SINGLE_RX_URB                 BIT(1)
  #define NO_CAP_LINE                   BIT(2)
 -#define NOT_A_MODEM                   BIT(3)
  #define NO_DATA_INTERFACE             BIT(4)
  #define IGNORE_DEVICE                 BIT(5)
+ #define QUIRK_CONTROL_LINE_STATE      BIT(6)

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/storage/transport.c
Simple merge