From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Nov 2014 03:10:24 +0000 (+0900)
Subject: Merge 3.18-rc4 into usb-next.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03;p=linux-beck.git

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>
---

69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03
diff --cc drivers/usb/class/cdc-acm.h
index 8cd2c4b0b8ff,d3251ebd09e2..ffeb3c83941f
--- a/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)