Merge remote-tracking branch 'input/next'

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc drivers/input/misc/atlas_btns.c
index d781b5e520655f074071fb6fc6f9a6e9390086bd,c0c5b63af90a447e50851b7f7b106a1fde09c0c7..638165c78e75bde47b62e090598c1f854db157c2
--- 1/drivers/input/misc/atlas_btns.c
--- 2/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@@ -25,11 -25,10 +25,10 @@@
  
  #include <linux/kernel.h>
  #include <linux/module.h>
- #include <linux/init.h>
  #include <linux/input.h>
  #include <linux/types.h>
 +#include <linux/acpi.h>
  #include <asm/uaccess.h>
 -#include <acpi/acpi_drivers.h>
  
  #define ACPI_ATLAS_NAME               "Atlas ACPI"
  #define ACPI_ATLAS_CLASS      "Atlas"

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

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