Merge branch 'master' into upstream

Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
This commit is contained in:
Jiri Kosina
2012-08-27 08:04:24 -07:00
4870 changed files with 330601 additions and 110597 deletions

View File

@@ -336,6 +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