54 files changed, 1278 insertions, 375 deletions

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index ad0c4ac916dd..00f8652e193a 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -19,8 +19,7 @@ adi,adt7475		+/-1C TDM Extended Temp Range I.C
 adi,adt7476             +/-1C TDM Extended Temp Range I.C
 adi,adt7490             +/-1C TDM Extended Temp Range I.C
 adi,adxl345             Three-Axis Digital Accelerometer
-adi,adxl346             Three-Axis Digital Accelerometer
-adi,adxl34x             Three-Axis Digital Accelerometer
+adi,adxl346             Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)
 at,24c08                i2c serial eeprom  (24cxx)
 atmel,24c00             i2c serial eeprom  (24cxx)
 atmel,24c01             i2c serial eeprom  (24cxx)
diff --git a/Documentation/devicetree/bindings/input/ti,drv2665.txt b/Documentation/devicetree/bindings/input/ti,drv2665.txt
new file mode 100644
index 000000000000..1ba97ac04305
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/ti,drv2665.txt
@@ -0,0 +1,17 @@
+* Texas Instruments - drv2665 Haptics driver
+
+Required properties:
+        - compatible - "ti,drv2665" - DRV2665
+        - reg -  I2C slave address
+        - vbat-supply - Required supply regulator
+
+Example:
+
+haptics: haptics@59 {
+        compatible = "ti,drv2665";
+        reg = <0x59>;
+        vbat-supply = <&vbat>;
+};
+
+For more product information please see the link below:
+http://www.ti.com/product/drv2665
diff --git a/Documentation/leds/leds-class.txt b/Documentation/leds/leds-class.txt
index 79699c200766..62261c04060a 100644
--- a/Documentation/leds/leds-class.txt
+++ b/Documentation/leds/leds-class.txt
@@ -2,9 +2,6 @@
 LED handling under Linux
 ========================
 
-If you're reading this and thinking about keyboard leds, these are
-handled by the input subsystem and the led class is *not* needed.
-
 In its simplest form, the LED class just allows control of LEDs from
 userspace. LEDs appear in /sys/class/leds/. The maximum brightness of the
 LED is defined in max_brightness file. The brightness file will set the brightness
diff --git a/MAINTAINERS b/MAINTAINERS
index d7c53502aa86..246d9d841ad2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5171,7 +5171,6 @@ F:	include/linux/input/
 INPUT MULTITOUCH (MT) PROTOCOL
 M:      Henrik Rydberg <rydberg@bitmath.org>
 L:      linux-input@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
 S:      Odd fixes
 F:      Documentation/input/multi-touch-protocol.txt
 F:      drivers/input/input-mt.c
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index a11ff74a5127..a35532ec00e4 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -25,6 +25,19 @@ config INPUT
 
 if INPUT
 
+config INPUT_LEDS
+        tristate "Export input device LEDs in sysfs"
+        depends on LEDS_CLASS
+        default INPUT
+        help
+          Say Y here if you would like to export LEDs on input devices
+          as standard LED class devices in sysfs.
+
+          If unsure, say Y.
+
+          To compile this driver as a module, choose M here: the
+          module will be called input-leds.
+
 config INPUT_FF_MEMLESS
         tristate "Support for memoryless force-feedback devices"
         help
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 5ca3f631497f..0c9302ca9954 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o
 obj-$(CONFIG_INPUT_SPARSEKMAP)  += sparse-keymap.o
 obj-$(CONFIG_INPUT_MATRIXKMAP)  += matrix-keymap.o
 
+obj-$(CONFIG_INPUT_LEDS)        += input-leds.o
 obj-$(CONFIG_INPUT_MOUSEDEV)    += mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)      += joydev.o
 obj-$(CONFIG_INPUT_EVDEV)       += evdev.o
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index a18f41b89b6a..9d35499faca4 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -422,10 +422,7 @@ static int evdev_release(struct inode *inode, struct file *file)
 
         evdev_detach_client(evdev, client);
 
-        if (is_vmalloc_addr(client))
-                vfree(client);
-        else
-                kfree(client);
+        kvfree(client);
 
         evdev_close_device(evdev);
 
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index b81c88c43452..8f4a30fccbb6 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -70,7 +70,7 @@ static int compat_effect(struct ff_device *ff, struct ff_effect *effect)
                         return -EINVAL;
 
                 /*
-                 * calculate manginude of sine wave as average of rumble's
+                 * calculate magnitude of sine wave as average of rumble's
                  * 2/3 of strong magnitude and 1/3 of weak magnitude
                  */