Merge branch 'next' into for-linus
Showing
- Documentation/input/multi-touch-protocol.txt 149 additions, 69 deletionsDocumentation/input/multi-touch-protocol.txt
- arch/arm/plat-samsung/include/plat/keypad.h 43 additions, 0 deletionsarch/arm/plat-samsung/include/plat/keypad.h
- drivers/char/keyboard.c 5 additions, 1 deletiondrivers/char/keyboard.c
- drivers/hid/hid-core.c 1 addition, 0 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-ids.h 1 addition, 0 deletionsdrivers/hid/hid-ids.h
- drivers/hid/hid-input.c 3 additions, 0 deletionsdrivers/hid/hid-input.c
- drivers/input/evdev.c 42 additions, 12 deletionsdrivers/input/evdev.c
- drivers/input/input.c 125 additions, 57 deletionsdrivers/input/input.c
- drivers/input/joydev.c 3 additions, 4 deletionsdrivers/input/joydev.c
- drivers/input/joystick/xpad.c 63 additions, 44 deletionsdrivers/input/joystick/xpad.c
- drivers/input/keyboard/Kconfig 21 additions, 0 deletionsdrivers/input/keyboard/Kconfig
- drivers/input/keyboard/Makefile 2 additions, 0 deletionsdrivers/input/keyboard/Makefile
- drivers/input/keyboard/adp5588-keys.c 342 additions, 9 deletionsdrivers/input/keyboard/adp5588-keys.c
- drivers/input/keyboard/gpio_keys.c 14 additions, 5 deletionsdrivers/input/keyboard/gpio_keys.c
- drivers/input/keyboard/lm8323.c 7 additions, 5 deletionsdrivers/input/keyboard/lm8323.c
- drivers/input/keyboard/matrix_keypad.c 80 additions, 28 deletionsdrivers/input/keyboard/matrix_keypad.c
- drivers/input/keyboard/mcs_touchkey.c 239 additions, 0 deletionsdrivers/input/keyboard/mcs_touchkey.c
- drivers/input/keyboard/samsung-keypad.c 491 additions, 0 deletionsdrivers/input/keyboard/samsung-keypad.c
- drivers/input/misc/Kconfig 48 additions, 0 deletionsdrivers/input/misc/Kconfig
- drivers/input/misc/Makefile 4 additions, 0 deletionsdrivers/input/misc/Makefile
Loading
Please register or sign in to comment