Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenovo',...

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
index 40627c7,d6cc6a9,7c86373,e23ab8b,2aa5091,0d38df7,f9f476d,7c86373,27e0f51,e23ab8b..7460f34
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
--- 5/drivers/hid/hid-ids.h
--- 6/drivers/hid/hid-ids.h
--- 7/drivers/hid/hid-ids.h
--- 8/drivers/hid/hid-ids.h
--- 9/drivers/hid/hid-ids.h
--- 10/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@@@@@@@@ -298,10 -298,9 -298,9 -298,8 -298,6 -298,6 -298,8 -298,9 -298,9 -298,8 +298,10 @@@@@@@@@@@
          
          #define USB_VENDOR_ID_ELAN            0x04f3
          #define USB_DEVICE_ID_ELAN_TOUCHSCREEN        0x0089
    ++    #define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B   0x009b
   ++++  +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103   0x0103
 +++++++++#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c   0x010c
    ++    #define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F   0x016f
          
          #define USB_VENDOR_ID_ELECOM          0x056e
          #define USB_DEVICE_ID_ELECOM_BM084    0x0061

diff --cc drivers/hid/hid-input.c
index be3eba8,1e95f4d,725f22c,725f22c,7ea582b,2df7fdd,725f22c,725f22c,725f22c,725f22c..e0a0f06
--- 1/drivers/hid/hid-input.c
--- 2/drivers/hid/hid-input.c
--- 3/drivers/hid/hid-input.c
--- 4/drivers/hid/hid-input.c
--- 5/drivers/hid/hid-input.c
--- 6/drivers/hid/hid-input.c
--- 7/drivers/hid/hid-input.c
--- 8/drivers/hid/hid-input.c
--- 9/drivers/hid/hid-input.c
--- 10/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@@@@@@@@@ -865,14 -865,14 -865,14 -865,14 -862,7 -862,7 -865,14 -865,14 -865,14 -865,14 +865,14 @@@@@@@@@@@ static void hidinput_configure_usage(st
                        case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
                        case 0x28c: map_key_clear(KEY_SEND);            break;
          
     -                  default:    goto ignore;
    ++                  case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV);             break;
    ++                  case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT);             break;
    ++                  case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP);                break;
    ++                  case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP);                break;
    ++                  case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT);   break;
    ++                  case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL);   break;
    ++    
 ---  ----              default:    goto ignore;
 +++ +++++              default: map_key_clear(KEY_UNKNOWN);
                        }
                        break;
          

diff --cc drivers/hid/i2c-hid/i2c-hid.c
Simple merge

diff --cc drivers/hid/usbhid/hid-core.c
Simple merge

diff --cc drivers/hid/usbhid/hid-quirks.c
index 3e5f169,552671e,552671e,5014bb5,f3cb5b0,be67635,5014bb5,552671e,552671e,5014bb5..dc89be9
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/drivers/hid/usbhid/hid-quirks.c
--- 3/drivers/hid/usbhid/hid-quirks.c
--- 4/drivers/hid/usbhid/hid-quirks.c
--- 5/drivers/hid/usbhid/hid-quirks.c
--- 6/drivers/hid/usbhid/hid-quirks.c
--- 7/drivers/hid/usbhid/hid-quirks.c
--- 8/drivers/hid/usbhid/hid-quirks.c
--- 9/drivers/hid/usbhid/hid-quirks.c
--- 10/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@@@@@@@@@ -71,10 -71,9 -71,9 -71,8 -71,6 -71,6 -71,8 -71,9 -71,9 -71,8 +71,10 @@@@@@@@@@@ static const struct hid_blacklist 
                { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
                { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
                { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },
    ++          { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },
   ++++  +      { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL },
 +++++++++      { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c, HID_QUIRK_ALWAYS_POLL },
    ++          { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },
                { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
                { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
                { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },

diff --cc drivers/hid/wacom_sys.c
index b6bcd25,8e02a4a,8593047,8593047,8593047,8593047,8593047,8593047,8593047,872aa0b..6542029
--- 1/drivers/hid/wacom_sys.c
--- 2/drivers/hid/wacom_sys.c
--- 3/drivers/hid/wacom_sys.c
--- 4/drivers/hid/wacom_sys.c
--- 5/drivers/hid/wacom_sys.c
--- 6/drivers/hid/wacom_sys.c
--- 7/drivers/hid/wacom_sys.c
--- 8/drivers/hid/wacom_sys.c
--- 9/drivers/hid/wacom_sys.c
--- 10/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@@@@@@@@@@ -70,8 -70,13 -70,13 -70,13 -70,13 -70,13 -70,13 -70,13 -70,13 -71,13 +71,8 @@@@@@@@@@@ static int wacom_raw_event(struct hid_d
          static int wacom_open(struct input_dev *dev)
          {
                struct wacom *wacom = input_get_drvdata(dev);
 ---------      int retval;
 -------- 
 --------       mutex_lock(&wacom->lock);
 --------       retval = hid_hw_open(wacom->hdev);
 --------       mutex_unlock(&wacom->lock);
          
         -      mutex_lock(&wacom->lock);
         -      retval = hid_hw_open(wacom->hdev);
         -      mutex_unlock(&wacom->lock);
         -
 ---------      return retval;
 +++++++++      return hid_hw_open(wacom->hdev);
          }
          
          static void wacom_close(struct input_dev *dev)

diff --cc drivers/hid/wacom_wac.c
Simple merge

diff --cc include/linux/hid.h
index 5b1ff61,2366fda,78ea9bf,78ea9bf,7d6e055,78ea9bf,58a89ed,78ea9bf,78ea9bf,78ea9bf..06c4607
--- 1/include/linux/hid.h
--- 2/include/linux/hid.h
--- 3/include/linux/hid.h
--- 4/include/linux/hid.h
--- 5/include/linux/hid.h
--- 6/include/linux/hid.h
--- 7/include/linux/hid.h
--- 8/include/linux/hid.h
--- 9/include/linux/hid.h
--- 10/include/linux/hid.h
+++ b/include/linux/hid.h
@@@@@@@@@@@ -312,7 -312,11 -312,11 -312,11 -312,8 -312,11 -339,11 -312,11 -312,11 -312,11 +339,8 @@@@@@@@@@@ struct hid_item 
           * Vendor specific HID device groups
           */
          #define HID_GROUP_RMI                         0x0100
 --- -----
 --- -----/*
 --- ----- * Vendor specific HID device groups
 --- ----- */
          #define HID_GROUP_WACOM                               0x0101
++++ +++++#define HID_GROUP_LOGITECH_DJ_DEVICE          0x0102
          
          /*
           * This is the global environment of the parser. This information is