Merge branch 'master' into for-linus

2026-09-26 18:16:26 +00:00 · 2008-04-24 23:37:52 -04:00 · 2008-04-24 23:37:52 -04:00 · 308f0a5898
commit 308f0a5898
parent 0035a1dc8f b345dc7da0
49 changed files with 3904 additions and 119 deletions
--- a/10
+++ b/10
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
--- a/drivers/input/input-polldev.c
+++ b/drivers/input/input-polldev.c
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
--- a/drivers/input/joystick/Makefile
+++ b/drivers/input/joystick/Makefile
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
--- a/drivers/input/joystick/zhenhua.c
+++ b/drivers/input/joystick/zhenhua.c
--- a/drivers/input/keyboard/aaed2000_kbd.c
+++ b/drivers/input/keyboard/aaed2000_kbd.c
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
--- a/drivers/input/keyboard/jornada680_kbd.c
+++ b/drivers/input/keyboard/jornada680_kbd.c
--- a/drivers/input/keyboard/jornada720_kbd.c
+++ b/drivers/input/keyboard/jornada720_kbd.c
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
--- a/drivers/input/keyboard/tosakbd.c
+++ b/drivers/input/keyboard/tosakbd.c
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
--- a/drivers/input/serio/at32psif.c
+++ b/drivers/input/serio/at32psif.c
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
--- a/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
--- a/drivers/input/touchscreen/wm9705.c
+++ b/drivers/input/touchscreen/wm9705.c
--- a/drivers/input/touchscreen/wm9712.c
+++ b/drivers/input/touchscreen/wm9712.c
--- a/drivers/input/touchscreen/wm9713.c
+++ b/drivers/input/touchscreen/wm9713.c
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/include/linux/keyboard.h
+++ b/include/linux/keyboard.h
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
--- a/include/linux/wm97xx.h
+++ b/include/linux/wm97xx.h