From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 30 Apr 2013 08:19:07 +0000 (+0200)
Subject: Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into... 
X-Git-Tag: v3.10-rc1~160^2~1
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=047dff63f913c21c5228b94118e7996ab998cdc4;p=cascardo%2Flinux.git

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

Conflicts:
	drivers/hid/Kconfig
---

047dff63f913c21c5228b94118e7996ab998cdc4
diff --cc drivers/hid/Kconfig
index 15187b85895d,5f07d85c4189,edb15c8741d0..fb52f3f6de80
--- a/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