Merge branch 'next' into for-linus

Documentation/input/rotary-encoder.txt

arch/mips/include/asm/mach-rc32434/gpio.h

arch/mips/rb532/devices.c

drivers/input/input.c

drivers/input/keyboard/atkbd.c

drivers/input/keyboard/bf54x-keys.c

drivers/input/keyboard/hilkbd.c

drivers/input/misc/Kconfig

drivers/input/misc/Makefile

drivers/input/misc/ati_remote2.c

drivers/input/misc/rb532_button.c

drivers/input/misc/rotary_encoder.c

drivers/input/mouse/Kconfig

drivers/input/mouse/Makefile

drivers/input/mouse/hgpk.c

drivers/input/mouse/maplemouse.c

drivers/input/mouse/pc110pad.c

drivers/input/serio/i8042-x86ia64io.h

drivers/input/touchscreen/Kconfig

drivers/input/touchscreen/Makefile