Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input...

Conflicts:
	drivers/input/Makefile

diff --cc drivers/input/Makefile
index 9fd1cf2b705e6a07460002ac5ac5d6593b92e954,569938b3cc040ab6ab7db4a52441041777b7b23a..09614ce74961bccded0b02ecd29815f3947533a1
--- 1/drivers/input/Makefile
--- 2/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@@ -5,7 -5,7 +5,7 @@@
  # Each configuration option enables a list of files.
  
  obj-$(CONFIG_INPUT)           += input-core.o
- input-core-y := input.o input-compat.o ff-core.o
 -input-core-objs := input.o input-compat.o ff-core.o input-mt.o
++input-core-y := input.o input-compat.o input-mt.o ff-core.o
  
  obj-$(CONFIG_INPUT_FF_MEMLESS)        += ff-memless.o
  obj-$(CONFIG_INPUT_POLLDEV)   += input-polldev.o

diff --cc drivers/input/input.c
index c7a1e826c58093932ab709a988e3d9e861c06684,37708d1d86ec2e518f35959b64d42ff7a67411a8..3312e20016bfa84ef1d7bea4b26070c63f62807c
--- 1/drivers/input/input.c
--- 2/drivers/input/input.c
+++ b/drivers/input/input.c
@@@ -10,11 -10,9 +10,11 @@@
   * the Free Software Foundation.
   */
  
 +#define pr_fmt(fmt) KBUILD_BASENAME ": " fmt
 +
  #include <linux/init.h>
  #include <linux/types.h>
- #include <linux/input.h>
+ #include <linux/input/mt.h>
  #include <linux/module.h>
  #include <linux/slab.h>
  #include <linux/random.h>

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