Merge tag v3.9-rc1 into for-3.9/upstream-fixes

This is done so that I am able to apply fix for commit
0322bd3980b3 ("usb hid quirks for Masterkit MA901 usb radio") which
went into 3.9-rc1.

diff --combined drivers/hid/hid-ids.h
index 49b88a0608fb382a699a65c0e6a6a0d411b8c007,92e47e5c956426878e0e69d80811831d9b92e483..c4388776f4e470ae527470fb47357c220bbf9624
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -557,6 -557,9 +557,9 @@@
  #define USB_VENDOR_ID_MADCATZ         0x0738
  #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
  
+ #define USB_VENDOR_ID_MASTERKIT                       0x16c0
+ #define USB_DEVICE_ID_MASTERKIT_MA901RADIO    0x05df
+ 
  #define USB_VENDOR_ID_MCC             0x09db
  #define USB_DEVICE_ID_MCC_PMD1024LS   0x0076
  #define USB_DEVICE_ID_MCC_PMD1208LS   0x007a
@@@ -587,9 -590,6 +590,9 @@@
  #define USB_VENDOR_ID_MONTEREY                0x0566
  #define USB_DEVICE_ID_GENIUS_KB29E    0x3004
  
 +#define USB_VENDOR_ID_MSI             0x1770
 +#define USB_DEVICE_ID_MSI_GX680R_LED_PANEL    0xff00
 +
  #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
  #define USB_DEVICE_ID_N_S_HARMONY     0xc359
  
@@@ -684,9 -684,6 +687,9 @@@
  #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001               0x3001
  #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008               0x3008
  
 +#define USB_VENDOR_ID_REALTEK         0x0bda
 +#define USB_DEVICE_ID_REALTEK_READER  0x0152
 +
  #define USB_VENDOR_ID_ROCCAT          0x1e7d
  #define USB_DEVICE_ID_ROCCAT_ARVO     0x30d4
  #define USB_DEVICE_ID_ROCCAT_ISKU     0x319c