Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/Makefile

diff --cc drivers/hid/Kconfig
index 3890ac698061cfd70534ebc499d27ece77d4475f,3d14e4f6bac10df5a2e5902dede68ebfc7abd603..a3d033252995aeb388fbcabc1dab8a286e38cb51
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -478,13 -481,69 +483,22 @@@ config HID_PRIMA
        HID standard.
  
  config HID_ROCCAT
 -      tristate "Roccat special event support"
 +      tristate "Roccat device support"
        depends on USB_HID
 -      select HID_ROCCAT_COMMON
        ---help---
 -      Support for Roccat special events.
 -      Say Y here if you have a Roccat mouse or keyboard and want OSD or
 -      macro execution support.
 -
 -config HID_ROCCAT_COMMON
 -      tristate
 -      depends on HID_ROCCAT
 -
 -config HID_ROCCAT_ARVO
 -      tristate "Roccat Arvo keyboard support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Arvo keyboard.
 -
 -config HID_ROCCAT_ISKU
 -      tristate "Roccat Isku keyboard support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Isku keyboard.
 -
 -config HID_ROCCAT_KONE
 -      tristate "Roccat Kone Mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Kone mouse.
 -
 -config HID_ROCCAT_KONEPLUS
 -      tristate "Roccat Kone[+] mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Kone[+] mouse.
 -
 -config HID_ROCCAT_KOVAPLUS
 -      tristate "Roccat Kova[+] mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Kova[+] mouse.
 -
 -config HID_ROCCAT_PYRA
 -      tristate "Roccat Pyra mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Pyra mouse.
 +      Support for Roccat devices.
 +      Say Y here if you have a Roccat mouse or keyboard and want
 +      support for its special functionalities.
  
+ config HID_SAITEK
+       tristate "Saitek non-fully HID-compliant devices"
+       depends on USB_HID
+       ---help---
+       Support for Saitek devices that are not fully compliant with the
+       HID standard.
+ 
+       Currently only supports the PS1000 controller.
+ 
  config HID_SAMSUNG
        tristate "Samsung InfraRed remote control or keyboards"
        depends on USB_HID

diff --cc drivers/hid/Makefile
index 7d926719e21b7d214ad87c20a7264c09193c6b69,524532b49eaa250ce06c15dfc6d8ad98153c184d..22f1d16cd79c7a680a6983812146459fd76ff1ab
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -64,9 -64,15 +64,10 @@@ obj-$(CONFIG_HID_PANTHERLORD)       += hid-pl
  obj-$(CONFIG_HID_PETALYNX)    += hid-petalynx.o
  obj-$(CONFIG_HID_PICOLCD)     += hid-picolcd.o
  obj-$(CONFIG_HID_PRIMAX)      += hid-primax.o
 -obj-$(CONFIG_HID_ROCCAT)      += hid-roccat.o
 -obj-$(CONFIG_HID_ROCCAT_COMMON)       += hid-roccat-common.o
 -obj-$(CONFIG_HID_ROCCAT_ARVO) += hid-roccat-arvo.o
 -obj-$(CONFIG_HID_ROCCAT_ISKU) += hid-roccat-isku.o
 -obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o
 -obj-$(CONFIG_HID_ROCCAT_KONEPLUS)     += hid-roccat-koneplus.o
 -obj-$(CONFIG_HID_ROCCAT_KOVAPLUS)     += hid-roccat-kovaplus.o
 -obj-$(CONFIG_HID_ROCCAT_PYRA) += hid-roccat-pyra.o
 +obj-$(CONFIG_HID_ROCCAT)      += hid-roccat.o hid-roccat-common.o \
 +      hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
 +      hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o
+ obj-$(CONFIG_HID_SAITEK)      += hid-saitek.o
  obj-$(CONFIG_HID_SAMSUNG)     += hid-samsung.o
  obj-$(CONFIG_HID_SMARTJOYPLUS)        += hid-sjoy.o
  obj-$(CONFIG_HID_SONY)                += hid-sony.o

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

diff --cc drivers/hid/hid-ids.h
Simple merge

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

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

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