Merge tag 'v3.12-rc4' into next

Merge with mainline to bring in changes to input subsystem that were
committed through other trees.

diff --combined drivers/input/serio/Kconfig
index a5f342e7ea91623153c1ab8e47069935e8c2c860,33b3e88fe4a2312f0047a4a700a2733c9ef81ee4..296cb88d70080eaae14c06a5179ffb11cfae107f
--- 1/drivers/input/serio/Kconfig
--- 2/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@@ -239,7 -239,6 +239,6 @@@ config SERIO_PS2MUL
  
  config SERIO_ARC_PS2
        tristate "ARC PS/2 support"
-       depends on GENERIC_HARDIRQS
        help
          Say Y here if you have an ARC FPGA platform with a PS/2
          controller in it.
@@@ -267,14 -266,4 +266,14 @@@ config SERIO_OLPC_APS
          To compile this driver as a module, choose M here: the module will
          be called olpc_apsp.
  
 +config HYPERV_KEYBOARD
 +      tristate "Microsoft Synthetic Keyboard driver"
 +      depends on HYPERV
 +      default HYPERV
 +      help
 +        Select this option to enable the Hyper-V Keyboard driver.
 +
 +        To compile this driver as a module, choose M here: the module will
 +        be called hyperv_keyboard.
 +
  endif