From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 10 Jul 2017 09:11:05 +0000 (+0200)
Subject: Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus
X-Git-Tag: v4.14-rc1~511^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=604250ddcf874c4ee4137bf754f57fa903a3c1c1;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus

Conflicts:
	drivers/hid/hid-core.c
---

604250ddcf874c4ee4137bf754f57fa903a3c1c1
diff --cc drivers/hid/hid-core.c
index dfd34d7,37084b6,bd48e15..09f1223
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@ -1981,17 -1912,12 -1912,13 +1981,20 @@@@ static const struct hid_device_id hid_h
   	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) },
   	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
   	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2) },
 --	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
  -	{ HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) },
 --	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) },
 --	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
 ++#endif
 ++#if IS_ENABLED(CONFIG_HID_ICADE)
   	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
 ++#endif
+++#if IS_ENABLED(CONFIG_HID_ITE)
+++	{ HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) },
+++#endif
 ++#if IS_ENABLED(CONFIG_HID_KENSINGTON)
   	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
 ++#endif
 ++#if IS_ENABLED(CONFIG_HID_KEYTOUCH)
   	{ HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
 ++#endif
 ++#if IS_ENABLED(CONFIG_HID_KYE)
   	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },
   	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_MANTICORE) },
   	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GX_IMPERATOR) },