From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Dec 2013 01:10:37 +0000 (+1100)
Subject: Merge remote-tracking branch 'input/next'
X-Git-Tag: next-20131213~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95d049203ee93156fbae1a880c43b0f10b4aa1f8;p=karo-tx-linux.git

Merge remote-tracking branch 'input/next'
---

95d049203ee93156fbae1a880c43b0f10b4aa1f8
diff --cc drivers/input/tablet/wacom_wac.c
index 782c2535f1d8,eb60a284be05..7655088f78e0
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -2333,10 -2355,11 +2361,13 @@@ const struct usb_device_id wacom_ids[] 
  	{ USB_DEVICE_WACOM(0x100) },
  	{ USB_DEVICE_WACOM(0x101) },
  	{ USB_DEVICE_WACOM(0x10D) },
 +	{ USB_DEVICE_WACOM(0x10E) },
 +	{ USB_DEVICE_WACOM(0x10F) },
  	{ USB_DEVICE_WACOM(0x300) },
  	{ USB_DEVICE_WACOM(0x301) },
+ 	{ USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) },
+ 	{ USB_DEVICE_DETAILED(0x303, USB_CLASS_HID, 0, 0) },
+ 	{ USB_DEVICE_DETAILED(0x30E, USB_CLASS_HID, 0, 0) },
  	{ USB_DEVICE_WACOM(0x304) },
  	{ USB_DEVICE_DETAILED(0x314, USB_CLASS_HID, 0, 0) },
  	{ USB_DEVICE_DETAILED(0x315, USB_CLASS_HID, 0, 0) },