Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (61 commits)
  HID: hid-magicmouse: Magic Trackpad has 1 button, not 2
  HID: Add device IDs for more SJOY adapters
  HID: primax: remove spurious dependency
  HID: support primax keyboards violating USB HID spec
  HID: usbhid: cancel timer for retry synchronously
  HID: wacom: Set input bits before registration
  HID: consolidate MacbookAir 4,1 mappings
  HID: MacbookAir4,1 and MacbookAir4,2 need entry in hid_mouse_ignore_list[]
  HID: Add support MacbookAir 4,1 keyboard
  HID: hidraw: open count should not increase if error
  HID: hiddev: potential info leak in hiddev_ioctl()
  HID: multitouch: decide if hid-multitouch needs to handle mt devices
  HID: add autodetection of multitouch devices
  HID: "hid-logitech" driver with Logitech Driving Force GT
  HID: hid-logitech-dj: fix off by one
  HID: hidraw: protect hidraw_disconnect() better
  HID: hid-multitouch: add support for the IDEACOM 6650 chip
  HID: Add full support for Logitech Unifying receivers
  HID: hidraw: free list for all error in hidraw_open
  HID: roccat: Kone now reports external profile changes via roccat device
  ...

32 files changed, 2804 insertions, 224 deletions

diff --git a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
new file mode 100644
index 000000000000..9aec8ef228b0
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
@@ -0,0 +1,7 @@
+What:           /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.
+Date:           July 2011
+KernelVersion:  3.2
+Contact:        Michal Malý <madcatxster@gmail.com>
+Description:    Display minimum, maximum and current range of the steering
+                wheel. Writing a value within min and max boundaries sets the
+                range of the wheel.
diff --git a/MAINTAINERS b/MAINTAINERS
index 51a8160dc549..914b8bd318ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7147,6 +7147,12 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 F:      drivers/scsi/wd7000.c
 
+WIIMOTE HID DRIVER
+M:      David Herrmann <dh.herrmann@googlemail.com>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      drivers/hid/hid-wiimote*
+
 WINBOND CIR DRIVER
 M:      David Härdeman <david@hardeman.nu>
 S:      Maintained
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 1130a8987125..22a4a051f221 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -69,7 +69,7 @@ config HID_ACRUX
         Say Y here if you want to enable support for ACRUX game controllers.
 
 config HID_ACRUX_FF
-        tristate "ACRUX force feedback support"
+        bool "ACRUX force feedback support"
         depends on HID_ACRUX
         select INPUT_FF_MEMLESS
         ---help---
@@ -245,6 +245,15 @@ config HID_LOGITECH
         ---help---
         Support for Logitech devices that are not fully compliant with HID standard.
 
+config HID_LOGITECH_DJ
+        tristate "Logitech Unifying receivers full support"
+        depends on HID_LOGITECH
+        default m
+        ---help---
+        Say Y if you want support for Logitech Unifying receivers and devices.
+        Unifying receivers are capable of pairing up to 6 Logitech compliant
+        devices to the same receiver.
+
 config LOGITECH_FF
         bool "Logitech force feedback support"
         depends on HID_LOGITECH
@@ -278,13 +287,21 @@ config LOGIG940_FF
           Say Y here if you want to enable force feedback support for Logitech
           Flight System G940 devices.
 
-config LOGIWII_FF
-        bool "Logitech Speed Force Wireless force feedback support"
+config LOGIWHEELS_FF
+        bool "Logitech wheels configuration and force feedback support"
         depends on HID_LOGITECH
         select INPUT_FF_MEMLESS
+        default LOGITECH_FF
         help
-          Say Y here if you want to enable force feedback support for Logitech
-          Speed Force Wireless (Wii) devices.
+          Say Y here if you want to enable force feedback and range setting
+          support for following Logitech wheels:
+          - Logitech Driving Force
+          - Logitech Driving Force Pro
+          - Logitech Driving Force GT
+          - Logitech G25
+          - Logitech G27
+          - Logitech MOMO/MOMO 2
+          - Logitech Formula Force EX
 
 config HID_MAGICMOUSE
         tristate "Apple MagicMouse multi-touch support"
@@ -328,6 +345,7 @@ config HID_MULTITOUCH
           - Hanvon dual touch panels
           - Ilitek dual touch panels
           - IrTouch Infrared USB panels
+          - LG Display panels (Dell ST2220Tc)
           - Lumio CrystalTouch panels
           - MosArt dual-touch panels
           - PenMount dual touch panels
@@ -441,6 +459,13 @@ config HID_PICOLCD_LEDS
         ---help---
           Provide access to PicoLCD's GPO pins via leds class.
 
+config HID_PRIMAX
+        tristate "Primax non-fully HID-compliant devices"
+        depends on USB_HID
+        ---help---
+        Support for Primax devices that are not fully compliant with the
+        HID standard.
+
 config HID_QUANTA
         tristate "Quanta Optical Touch panels"
         depends on USB_HID
@@ -539,7 +564,11 @@ config HID_SMARTJOYPLUS
         tristate "SmartJoy PLUS PS2/USB adapter support"
         depends on USB_HID
         ---help---
-        Support for SmartJoy PLUS PS2/USB adapter.
+        Support for SmartJoy PLUS PS2/USB adapter, Super Dual Box,
+        Super Joy Box 3 Pro, Super Dual Box Pro, and Super Joy Box 5 Pro.
+
+        Note that DDR (Dance Dance Revolution) mode is not supported, nor
+        is pressure sensitive buttons on the pro models.
 
 config SMARTJOYPLUS_FF
         bool "SmartJoy PLUS PS2/USB adapter force feedback support"
@@ -590,6 +619,7 @@ config HID_WIIMOTE
         tristate "Nintendo Wii Remote support"
         depends on BT_HIDP
         depends on LEDS_CLASS
+        select POWER_SUPPLY
         ---help---
         Support for the Nintendo Wii Remote bluetooth device.
 
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 0a0a38e9fd28..1e0d2a638b28 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -21,7 +21,7 @@ endif
 ifdef CONFIG_LOGIG940_FF