Merge branch 'master' into upstream

Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.

diff --combined drivers/hid/hid-core.c
index 0b62bb510ffc3c4845e50873d80c1689ea45e642,8bf8a64e511543989c41624338304d0f11f0c59b..fa5fcca16a9a7ff26dc92bdeb85207915aa87873
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -374,7 -374,7 +374,7 @@@ static int hid_parser_global(struct hid
  
        case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:
                parser->global.report_size = item_udata(item);
 -              if (parser->global.report_size > 96) {
 +              if (parser->global.report_size > 128) {
                        hid_err(parser->device, "invalid report_size %d\n",
                                        parser->global.report_size);
                        return -1;
@@@ -1624,7 -1624,6 +1624,6 @@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) },
@@@ -1928,6 -1927,7 +1927,7 @@@ static const struct hid_device_id hid_i
        { HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_RADIOSHARK) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_100) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_101) },

diff --combined drivers/hid/hid-ids.h
index 5d886b7cade96c127445cb0aa5a89e081dfee7b3,1dcb76ff51e340a2215d735bdde23e5c370bade0..0709c0093ac5f6368714a1182c333c742af09577
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -296,9 -296,6 +296,9 @@@
  #define USB_VENDOR_ID_EZKEY           0x0518
  #define USB_DEVICE_ID_BTC_8193                0x0002
  
 +#define USB_VENDOR_ID_FREESCALE               0x15A2
 +#define USB_DEVICE_ID_FREESCALE_MX28  0x004F
 +
  #define USB_VENDOR_ID_FRUCTEL 0x25B6
  #define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002
  
@@@ -336,6 -333,7 +336,7 @@@
  #define USB_VENDOR_ID_GRIFFIN         0x077d
  #define USB_DEVICE_ID_POWERMATE               0x0410
  #define USB_DEVICE_ID_SOUNDKNOB               0x04AA
+ #define USB_DEVICE_ID_RADIOSHARK      0x627a
  
  #define USB_VENDOR_ID_GTCO            0x078c
  #define USB_DEVICE_ID_GTCO_90         0x0090
@@@ -654,6 -652,7 +655,6 @@@
  #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH            0x3000
  #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001               0x3001
  #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008               0x3008
 -#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001
  
  #define USB_VENDOR_ID_ROCCAT          0x1e7d
  #define USB_DEVICE_ID_ROCCAT_ARVO     0x30d4