Merge branch 'next' into for-linus

Conflicts:
	include/linux/input.h

diff --cc drivers/input/evdev.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/keyboard/Kconfig
index 3a87f3ba5f75ee1f6a94973c2a5414f0653e48a8,a378e959368e1df87266524cf919074a97c1ce6f..e98beae23cfdd83064480d97bd6a827ef4c5892c
--- 1/drivers/input/keyboard/Kconfig
--- 2/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -179,24 -179,8 +179,24 @@@ config KEYBOARD_GPI
          To compile this driver as a module, choose M here: the
          module will be called gpio_keys.
  
 +config KEYBOARD_GPIO_POLLED
 +      tristate "Polled GPIO buttons"
 +      depends on GENERIC_GPIO
 +      select INPUT_POLLDEV
 +      help
 +        This driver implements support for buttons connected
 +        to GPIO pins that are not capable of generating interrupts.
 +
 +        Say Y here if your device has buttons connected
 +        directly to such GPIO pins.  Your board-specific
 +        setup logic must also provide a platform device,
 +        with configuration data saying which GPIOs are used.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called gpio_keys_polled.
 +
  config KEYBOARD_TCA6416
-       tristate "TCA6416 Keypad Support"
+       tristate "TCA6416/TCA6408A Keypad Support"
        depends on I2C
        help
          This driver implements basic keypad functionality

diff --cc drivers/input/keyboard/Makefile
Simple merge

diff --cc drivers/input/mouse/synaptics.h
index 0aefaa8858714ba6e9963a9e6cd1f0c13fbab963,50e20e9da442ab858cec032d73bb8f51500f03ee..25e5d042a72c128c624357915b322b6bff9f7486
--- 1/drivers/input/mouse/synaptics.h
--- 2/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@@ -51,9 -51,9 +51,10 @@@
  #define SYN_EXT_CAP_REQUESTS(c)               (((c) & 0x700000) >> 20)
  #define SYN_CAP_MULTI_BUTTON_NO(ec)   (((ec) & 0x00f000) >> 12)
  #define SYN_CAP_PRODUCT_ID(ec)                (((ec) & 0xff0000) >> 16)
 -#define SYN_CAP_CLICKPAD(ex0c)                ((ex0c) & 0x100100)
 +#define SYN_CAP_CLICKPAD(ex0c)                ((ex0c) & 0x100000) /* 1-button ClickPad */
 +#define SYN_CAP_CLICKPAD2BTN(ex0c)    ((ex0c) & 0x000100) /* 2-button ClickPad */
  #define SYN_CAP_MAX_DIMENSIONS(ex0c)  ((ex0c) & 0x020000)
+ #define SYN_CAP_ADV_GESTURE(ex0c)     ((ex0c) & 0x080000)
  
  /* synaptics modes query bits */
  #define SYN_MODE_ABSOLUTE(m)          ((m) & (1 << 7))

diff --cc drivers/input/tablet/wacom_wac.c
Simple merge

diff --cc include/linux/input.h
index 9777668883be6aa18a309b6388616fe08ee900ea,6c407e553a404c9a5867985b344a07c9c25d955a..84d4ce0d983a219928d9c2fbfcd780588c9bdfce
--- 1/include/linux/input.h
--- 2/include/linux/input.h
+++ b/include/linux/input.h
@@@ -1155,7 -1138,8 +1163,8 @@@ struct ff_effect 
   *    of tracked contacts
   * @mtsize: number of MT slots the device uses
   * @slot: MT slot currently being transmitted
 - * @absinfo: array of &struct absinfo elements holding information
+  * @trkid: stores MT tracking ID for the current contact
 + * @absinfo: array of &struct input_absinfo elements holding information
   *    about absolute axes (current value, min, max, flat, fuzz,
   *    resolution)
   * @key: reflects current state of device's keys/buttons