Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus

Conflicts:
	drivers/hid/Kconfig

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 2b93d7f647ee..71d4c0703629 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -197,6 +197,15 @@ config LOGIG940_FF
           Say Y here if you want to enable force feedback support for Logitech
           Flight System G940 devices.
 
+config HID_MAGICMOUSE
+        tristate "Apple MagicMouse multi-touch support"
+        depends on BT_HIDP
+        ---help---
+        Support for the Apple Magic Mouse multi-touch.
+
+        Say Y here if you want support for the multi-touch features of the
+        Apple Wireless "Magic" Mouse.
+
 config HID_MICROSOFT
         tristate "Microsoft" if EMBEDDED
         depends on USB_HID