Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into...

Conflicts:
	drivers/hid/Kconfig

diff --cc drivers/hid/Kconfig
index 15187b85895d408ad561d02e374cbc8070d9dc9c,5f07d85c4189fc4e0aa41ad5c3bf63e7d77b2ae8,edb15c8741d0283d50592bdb649fb0b07b88ffc0..fb52f3f6de80a377112ea0af5dfb8153772cc14e
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@ -384,13 -373,13 -373,13 +384,13 @@@@ config LOGIWHEELS_F
          - Logitech Formula Force EX
   
   config HID_MAGICMOUSE
--      tristate "Apple MagicMouse multi-touch support"
 -      depends on BT_HIDP
++      tristate "Apple Magic Mouse/Trackpad multi-touch support"
  -     depends on BT_HIDP
 ++     depends on HID
        ---help---
--      Support for the Apple Magic Mouse multi-touch.
++      Support for the Apple Magic Mouse/Trackpad multi-touch.
   
        Say Y here if you want support for the multi-touch features of the
--      Apple Wireless "Magic" Mouse.
++      Apple Wireless "Magic" Mouse and the Apple Wireless "Magic" Trackpad.
   
   config HID_MICROSOFT
        tristate "Microsoft non-fully HID-compliant devices" if EXPERT
@@@@ -746,10 -735,10 -735,10 +746,10 @@@@ config HID_ZYDACRO
   
   config HID_SENSOR_HUB
        tristate "HID Sensors framework support"
 --     depends on USB_HID && GENERIC_HARDIRQS
 ++     depends on HID && GENERIC_HARDIRQS
        select MFD_CORE
        default n
--      -- help---
++      ---help---
          Support for HID Sensor framework. This creates a MFD instance
          for a sensor hub and identifies all the sensors connected to it.
          Each sensor is registered as a MFD cell, so that sensor specific

diff --cc drivers/hid/Makefile
Simple merge

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

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

diff --cc drivers/hid/hid-lenovo-tpkbd.c
Simple merge

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

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