Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
Conflicts: drivers/input/Makefile
Showing
- Documentation/DocBook/device-drivers.tmpl 4 additions, 0 deletionsDocumentation/DocBook/device-drivers.tmpl
- Documentation/input/multi-touch-protocol.txt 8 additions, 1 deletionDocumentation/input/multi-touch-protocol.txt
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- drivers/hid/Kconfig 2 additions, 1 deletiondrivers/hid/Kconfig
- drivers/hid/hid-3m-pct.c 4 additions, 32 deletionsdrivers/hid/hid-3m-pct.c
- drivers/hid/hid-core.c 2 additions, 0 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-egalax.c 55 additions, 74 deletionsdrivers/hid/hid-egalax.c
- drivers/hid/hid-ids.h 2 additions, 0 deletionsdrivers/hid/hid-ids.h
- drivers/input/Makefile 1 addition, 1 deletiondrivers/input/Makefile
- drivers/input/input-mt.c 170 additions, 0 deletionsdrivers/input/input-mt.c
- drivers/input/input.c 1 addition, 47 deletionsdrivers/input/input.c
- drivers/input/misc/uinput.c 2 additions, 2 deletionsdrivers/input/misc/uinput.c
- drivers/input/tablet/wacom_wac.c 7 additions, 19 deletionsdrivers/input/tablet/wacom_wac.c
- drivers/input/tablet/wacom_wac.h 0 additions, 4 deletionsdrivers/input/tablet/wacom_wac.h
- drivers/input/touchscreen/wacom_w8001.c 7 additions, 18 deletionsdrivers/input/touchscreen/wacom_w8001.c
- include/linux/input.h 5 additions, 17 deletionsinclude/linux/input.h
- include/linux/input/mt.h 57 additions, 0 deletionsinclude/linux/input/mt.h
Loading
Please register or sign in to comment