From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 9 Jan 2012 07:38:23 +0000 (-0800)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: MMI-PSA29.97-13-9~8540^2~382
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=da733563be5a9da26fe81d9f007262d00b846e22;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'next' into for-linus
---

da733563be5a9da26fe81d9f007262d00b846e22
diff --cc drivers/input/tablet/wacom_wac.c
index 2ee47d01a3b4,a22e7789d91b..88672ec296c1
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -1614,8 -1775,8 +1778,9 @@@ const struct usb_device_id wacom_ids[] 
  	{ USB_DEVICE_WACOM(0xE2) },
  	{ USB_DEVICE_WACOM(0xE3) },
  	{ USB_DEVICE_WACOM(0xE6) },
 +	{ USB_DEVICE_WACOM(0xEC) },
  	{ USB_DEVICE_WACOM(0x47) },
+ 	{ USB_DEVICE_WACOM(0xF4) },
  	{ USB_DEVICE_LENOVO(0x6004) },
  	{ }
  };