Merge commit 'd01d0756f7' into next-samsung

2026-11-10 20:48:12 +00:00 · 2010-08-06 21:27:24 +09:00 · 2010-08-06 21:27:24 +09:00 · 929343ef84
commit 929343ef84
parent d8653d9f65 d01d0756f7
56 changed files with 6496 additions and 983 deletions
--- a/Documentation/input/multi-touch-protocol.txt
+++ b/Documentation/input/multi-touch-protocol.txt
--- a/arch/arm/plat-samsung/include/plat/keypad.h
+++ b/arch/arm/plat-samsung/include/plat/keypad.h
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
--- a/drivers/input/misc/adxl34x-i2c.c
+++ b/drivers/input/misc/adxl34x-i2c.c
--- a/drivers/input/misc/adxl34x-spi.c
+++ b/drivers/input/misc/adxl34x-spi.c
--- a/drivers/input/misc/adxl34x.c
+++ b/drivers/input/misc/adxl34x.c
--- a/drivers/input/misc/adxl34x.h
+++ b/drivers/input/misc/adxl34x.h
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
--- a/drivers/input/serio/i8042-ppcio.h
+++ b/drivers/input/serio/i8042-ppcio.h
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
--- a/drivers/input/touchscreen/ad7879-i2c.c
+++ b/drivers/input/touchscreen/ad7879-i2c.c
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
--- a/drivers/input/touchscreen/ad7879.h
+++ b/drivers/input/touchscreen/ad7879.h
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
--- a/drivers/input/touchscreen/cy8ctmg110_ts.c
+++ b/drivers/input/touchscreen/cy8ctmg110_ts.c
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
--- a/drivers/input/touchscreen/qt602240_ts.c
+++ b/drivers/input/touchscreen/qt602240_ts.c
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
--- a/include/linux/i2c/adp5588.h
+++ b/include/linux/i2c/adp5588.h
--- a/include/linux/i2c/mcs.h
+++ b/include/linux/i2c/mcs.h
--- a/include/linux/i2c/mcs5000_ts.h
+++ b/include/linux/i2c/mcs5000_ts.h
--- a/include/linux/i2c/qt602240_ts.h
+++ b/include/linux/i2c/qt602240_ts.h
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/include/linux/input/adxl34x.h
+++ b/include/linux/input/adxl34x.h
--- a/include/linux/input/cy8ctmg110_pdata.h
+++ b/include/linux/input/cy8ctmg110_pdata.h
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h