Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into...

Conflicts:
	drivers/hid/Kconfig

diff --cc drivers/hid/Kconfig
index 2b93d7f647ee82211c2a4fe08c838bcab024aad6,0e668ccc25116b6e978b6e396c73e479225b90a4..71d4c0703629a55331aed27e12aa17cd63ffa66c
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -189,14 -183,15 +189,23 @@@ config LOGIRUMBLEPAD2_F
          Say Y here if you want to enable force feedback support for Logitech
          Rumblepad 2 devices.
  
 +config LOGIG940_FF
 +      bool "Logitech Flight System G940 force feedback support"
 +      depends on HID_LOGITECH
 +      select INPUT_FF_MEMLESS
 +      help
 +        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

diff --cc drivers/hid/Makefile
index 03051694d546d680c1720417f7cb824ac52c556a,45d81e9cd2deca066a0213c43907e421a8441c64..0b2618f092ca525b272bf10242ff4843b68cfce2
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -35,12 -31,10 +35,13 @@@ obj-$(CONFIG_HID_GYRATION) += hid-gyrat
  obj-$(CONFIG_HID_KENSINGTON)  += hid-kensington.o
  obj-$(CONFIG_HID_KYE)         += hid-kye.o
  obj-$(CONFIG_HID_LOGITECH)    += hid-logitech.o
+ obj-$(CONFIG_HID_MAGICMOUSE)    += hid-magicmouse.o
  obj-$(CONFIG_HID_MICROSOFT)   += hid-microsoft.o
  obj-$(CONFIG_HID_MONTEREY)    += hid-monterey.o
 +obj-$(CONFIG_HID_MOSART)      += hid-mosart.o
  obj-$(CONFIG_HID_NTRIG)               += hid-ntrig.o
 +obj-$(CONFIG_HID_ORTEK)               += hid-ortek.o
 +obj-$(CONFIG_HID_QUANTA)      += hid-quanta.o
  obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
  obj-$(CONFIG_HID_PETALYNX)    += hid-petalynx.o
  obj-$(CONFIG_HID_SAMSUNG)     += hid-samsung.o

diff --cc drivers/hid/hid-core.c
index da97195474ff0f5f78a150bc7485246fb106aa81,f038422f432c791580db1996c4b5e8376102e0c8..368fbb0c4ca6b161d2acea66d7a10bdf4c6a36f5
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1340,14 -1339,11 +1342,15 @@@ static const struct hid_device_id hid_b
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },

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

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

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

diff --cc include/linux/hid.h
Simple merge