Merge branch 'next' into for-linus
Dmitry Torokhov [Thu, 16 Oct 2008 03:29:12 +0000 (23:29 -0400)]
13 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/input/keyboard/bf54x-keys.c
drivers/input/keyboard/gpio_keys.c
drivers/input/mouse/Kconfig
drivers/input/mouse/Makefile
drivers/input/serio/i8042-x86ia64io.h
drivers/input/touchscreen/mainstone-wm97xx.c
drivers/input/touchscreen/wm9705.c
drivers/input/touchscreen/wm9712.c
drivers/input/touchscreen/wm9713.c
drivers/input/touchscreen/wm97xx-core.c
include/linux/Kbuild

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge