Merge branch 'next' into for-linus

Documentation/DocBook/device-drivers.tmpl

Documentation/input/cma3000_d0x.txt

Documentation/input/multi-touch-protocol.txt

MAINTAINERS

arch/arm/plat-spear/include/plat/keyboard.h

drivers/hid/Kconfig

drivers/hid/hid-3m-pct.c

drivers/hid/hid-core.c

drivers/hid/hid-egalax.c

drivers/hid/hid-ids.h

drivers/input/Makefile

drivers/input/apm-power.c

drivers/input/evbug.c

drivers/input/evdev.c

drivers/input/ff-core.c

drivers/input/ff-memless.c

drivers/input/gameport/gameport.c

drivers/input/input-mt.c

drivers/input/input-polldev.c

drivers/input/input.c