Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for...

diff --combined drivers/hid/hid-core.c
index 4f9c5c6,7f8105b,bdb8cc8,4f9c5c6..875ff6e
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@ -1856,6 -1856,7 -1856,6 -1856,6 +1856,7 @@@@@ static const struct hid_device_id hid_h
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+ ++    { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185BFM, 0x2208) },
@@@@@ -1979,9 -1980,6 -1979,6 -1979,9 +1980,9 @@@@@
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },
 ++     { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },
 ++     { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },
 ++     { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },

diff --combined drivers/hid/hid-ids.h
index 0238f01,1219e59,5c0e43e,c6eaff5..e550a3a
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@@ -163,6 -163,7 -163,6 -163,6 +163,7 @@@@@
    #define USB_VENDOR_ID_ASUSTEK               0x0b05
    #define USB_DEVICE_ID_ASUSTEK_LCM   0x1726
    #define USB_DEVICE_ID_ASUSTEK_LCM2  0x175b
+ ++#define USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD     0x8585
    
    #define USB_VENDOR_ID_ATEN          0x0557
    #define USB_DEVICE_ID_ATEN_UC100KM  0x2004
@@@@@ -259,7 -260,6 -259,6 -259,6 +260,7 @@@@@
    #define USB_DEVICE_ID_CORSAIR_K90   0x1b02
    
    #define USB_VENDOR_ID_CREATIVELABS  0x041e
 +++#define USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51  0x322c
    #define USB_DEVICE_ID_PRODIKEYS_PCMIDI      0x2801
    
    #define USB_VENDOR_ID_CVTOUCH               0x1ff7
@@@@@ -677,7 -677,6 -676,6 -676,7 +678,7 @@@@@
    #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b
    #define USB_DEVICE_ID_MS_OFFICE_KB  0x0048
    #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d
 ++ #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K 0x00b4
    #define USB_DEVICE_ID_MS_NE4K               0x00db
    #define USB_DEVICE_ID_MS_NE4K_JP    0x00dc
    #define USB_DEVICE_ID_MS_LK6K               0x00f9
@@@@@ -685,8 -684,6 -683,6 -684,8 +686,8 @@@@@
    #define USB_DEVICE_ID_MS_PRESENTER_8K_USB   0x0713
    #define USB_DEVICE_ID_MS_NE7K               0x071d
    #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K   0x0730
 ++ #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
 ++ #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600  0x0750
    #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
    #define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
    #define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799