Merge tag 'v3.7-rc4' into next to sync up Wacom bits

Linux 3.7-rc4

diff --combined drivers/input/keyboard/Kconfig
index 5a83afb,de08740..4830964
--- 1/drivers/input/keyboard/Kconfig
--- 2/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -134,7 -134,7 +134,7 @@@ config KEYBOARD_QT107
  
  config KEYBOARD_QT2160
        tristate "Atmel AT42QT2160 Touch Sensor Chip"
 -      depends on I2C && EXPERIMENTAL
 +      depends on I2C
        help
          If you say yes here you get support for Atmel AT42QT2160 Touch
          Sensor chip as a keyboard input.
@@@ -335,6 -335,7 +335,7 @@@ config KEYBOARD_LOCOM
  config KEYBOARD_LPC32XX
        tristate "LPC32XX matrix key scanner support"
        depends on ARCH_LPC32XX && OF
+       select INPUT_MATRIXKMAP
        help
          Say Y here if you want to use NXP LPC32XX SoC key scanner interface,
          connected to a key matrix.