Merge branch 'next' into for-linus

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/keyboard/bf54x-keys.c
Simple merge

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

diff --cc drivers/input/mouse/Kconfig
Simple merge

diff --cc drivers/input/mouse/Makefile
Simple merge

diff --cc drivers/input/serio/i8042-x86ia64io.h
Simple merge

diff --cc drivers/input/touchscreen/mainstone-wm97xx.c
Simple merge

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

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

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

diff --cc drivers/input/touchscreen/wm97xx-core.c
Simple merge

diff --cc include/linux/Kbuild
Simple merge