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

Pull HID subsystem updates from Jiri Kosina:
 "HID subsystem and drivers update. Highlights:

   - new support of a group of Win7/Win8 multitouch devices, from
     Benjamin Tissoires

   - fix for compat interface brokenness in uhid, from Dmitry Torokhov

   - conversion of drivers to use hid_driver helper, by H Hartley
     Sweeten

   - HID over I2C transport received ACPI enumeration support, written
     by Mika Westerberg

   - there is an ongoing effort to make HID sensor hubs independent of
     USB transport.  The first self-contained part of this work is
     provided here, done by Mika Westerberg

   - a few smaller fixes here and there, support for a couple new
     devices added"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (43 commits)
  HID: Correct Logitech order in hid-ids.h
  HID: LG4FF: Remove unnecessary deadzone code
  HID: LG: Prevent the Logitech Gaming Wheels deadzone
  HID: LG: Fix detection of Logitech Speed Force Wireless (WiiWheel)
  HID: LG: Add support for Logitech Momo Force (Red) Wheel
  HID: hidraw: print message when succesfully initialized
  HID: logitech: split accel, brake for Driving Force wheel
  HID: logitech: add report descriptor for Driving Force wheel
  HID: add ThingM blink(1) USB RGB LED support
  HID: uhid: make creating devices work on 64/32 systems
  HID: wiimote: fix nunchuck button parser
  HID: blacklist Velleman data acquisition boards
  HID: sensor-hub: don't limit the driver only to USB bus
  HID: sensor-hub: get rid of unused sensor_hub_grabbed_usages[] table
  HID: extend autodetect to handle I2C sensors as well
  HID: ntrig: use input_configured() callback to set the name
  HID: multitouch: do not use pointers towards hid-core
  HID: add missing GENERIC_HARDIRQ dependency
  HID: multitouch: make MT_CLS_ALWAYS_TRUE the new default class
  HID: multitouch: fix protocol for Elo panels
  ...

71 files changed, 1405 insertions, 824 deletions

diff --git a/Documentation/ABI/testing/sysfs-driver-hid-srws1 b/Documentation/ABI/testing/sysfs-driver-hid-srws1
new file mode 100644
index 000000000000..d0eba70c7d40
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-srws1
@@ -0,0 +1,21 @@
+What:           /sys/class/leds/SRWS1::<serial>::RPM1
+What:           /sys/class/leds/SRWS1::<serial>::RPM2
+What:           /sys/class/leds/SRWS1::<serial>::RPM3
+What:           /sys/class/leds/SRWS1::<serial>::RPM4
+What:           /sys/class/leds/SRWS1::<serial>::RPM5
+What:           /sys/class/leds/SRWS1::<serial>::RPM6
+What:           /sys/class/leds/SRWS1::<serial>::RPM7
+What:           /sys/class/leds/SRWS1::<serial>::RPM8
+What:           /sys/class/leds/SRWS1::<serial>::RPM9
+What:           /sys/class/leds/SRWS1::<serial>::RPM10
+What:           /sys/class/leds/SRWS1::<serial>::RPM11
+What:           /sys/class/leds/SRWS1::<serial>::RPM12
+What:           /sys/class/leds/SRWS1::<serial>::RPM13
+What:           /sys/class/leds/SRWS1::<serial>::RPM14
+What:           /sys/class/leds/SRWS1::<serial>::RPM15
+What:           /sys/class/leds/SRWS1::<serial>::RPMALL
+Date:           Jan 2013
+KernelVersion:  3.9
+Contact:        Simon Wood <simon@mungewell.org>
+Description:    Provides a control for turning on/off the LEDs which form
+                an RPM meter on the front of the controller
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-thingm b/Documentation/ABI/testing/sysfs-driver-hid-thingm
new file mode 100644
index 000000000000..abcffeedd20a
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-thingm
@@ -0,0 +1,23 @@
+What:           /sys/class/leds/blink1::<serial>/rgb
+Date:           January 2013
+Contact:        Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+Description:    The ThingM blink1 is an USB RGB LED. The color notation is
+                3-byte hexadecimal. Read this attribute to get the last set
+                color. Write the 24-bit hexadecimal color to change the current
+                LED color. The default color is full white (0xFFFFFF).
+                For instance, set the color to green with: echo 00FF00 > rgb
+
+What:           /sys/class/leds/blink1::<serial>/fade
+Date:           January 2013
+Contact:        Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+Description:    This attribute allows to set a fade time in milliseconds for
+                the next color change. Read the attribute to know the current
+                fade time. The default value is set to 0 (no fade time). For
+                instance, set a fade time of 2 seconds with: echo 2000 > fade
+
+What:           /sys/class/leds/blink1::<serial>/play
+Date:           January 2013
+Contact:        Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+Description:    This attribute is used to play/pause the light patterns. Write 1
+                to start playing, 0 to stop. Reading this attribute returns the
+                current playing status.
diff --git a/MAINTAINERS b/MAINTAINERS
index 81e4ad85dd5c..db061e961d37 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7611,6 +7611,11 @@ S:      Supported
 F:      drivers/thermal/
 F:      include/linux/thermal.h
 
+THINGM BLINK(1) USB RGB LED DRIVER
+M:      Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+S:      Maintained
+F:      drivers/hid/hid-thingm.c
+
 THINKPAD ACPI EXTRAS DRIVER
 M:      Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 L:      ibm-acpi-devel@lists.sourceforge.net
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index eae0c7e468cf..5f07d85c4189 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -596,6 +596,12 @@ config HID_SPEEDLINK
         ---help---
         Support for Speedlink Vicious and Divine Cezanne mouse.