Commit 308f0a5898033691d050374a949bbfe173987a16
Exists in
master
and in
7 other branches
Merge branch 'master' into for-linus
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 49 changed files Side-by-side Diff
- MAINTAINERS
- drivers/char/keyboard.c
- drivers/hid/usbhid/hid-quirks.c
- drivers/input/input-polldev.c
- drivers/input/joystick/Kconfig
- drivers/input/joystick/Makefile
- drivers/input/joystick/xpad.c
- drivers/input/joystick/zhenhua.c
- drivers/input/keyboard/aaed2000_kbd.c
- drivers/input/keyboard/bf54x-keys.c
- drivers/input/keyboard/corgikbd.c
- drivers/input/keyboard/gpio_keys.c
- drivers/input/keyboard/jornada680_kbd.c
- drivers/input/keyboard/jornada720_kbd.c
- drivers/input/keyboard/locomokbd.c
- drivers/input/keyboard/omap-keypad.c
- drivers/input/keyboard/pxa27x_keypad.c
- drivers/input/keyboard/spitzkbd.c
- drivers/input/keyboard/tosakbd.c
- drivers/input/misc/cobalt_btns.c
- drivers/input/mouse/gpio_mouse.c
- drivers/input/serio/Kconfig
- drivers/input/serio/Makefile
- drivers/input/serio/at32psif.c
- drivers/input/serio/i8042-x86ia64io.h
- drivers/input/serio/rpckbd.c
- drivers/input/tablet/Kconfig
- drivers/input/tablet/aiptek.c
- drivers/input/tablet/wacom.h
- drivers/input/tablet/wacom_sys.c
- drivers/input/tablet/wacom_wac.c
- drivers/input/touchscreen/Kconfig
- drivers/input/touchscreen/Makefile
- drivers/input/touchscreen/ads7846.c
- drivers/input/touchscreen/corgi_ts.c
- drivers/input/touchscreen/jornada720_ts.c
- drivers/input/touchscreen/mainstone-wm97xx.c
- drivers/input/touchscreen/ucb1400_ts.c
- drivers/input/touchscreen/usbtouchscreen.c
- drivers/input/touchscreen/wm9705.c
- drivers/input/touchscreen/wm9712.c
- drivers/input/touchscreen/wm9713.c
- drivers/input/touchscreen/wm97xx-core.c
- drivers/macintosh/mac_hid.c
- include/linux/input.h
- include/linux/keyboard.h
- include/linux/serio.h
- include/linux/spi/ads7846.h
- include/linux/wm97xx.h