From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 16 Dec 2013 10:04:49 +0000 (-0800)
Subject: Merge tag 'v3.13-rc4' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=348324c5b10bcba8d9daabdfb85a6927311be34f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'v3.13-rc4' into next

Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
---

348324c5b10bcba8d9daabdfb85a6927311be34f
diff --cc drivers/input/tablet/wacom_wac.c
index eb60a284be05,782c2535f1d8..7655088f78e0
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -2355,11 -2333,10 +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) },