Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt',...
Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt', 'for-3.12/logitech', 'for-3.12/multitouch-win8', 'for-3.12/trasnport-driver-cleanup', 'for-3.12/uhid', 'for-3.12/upstream' and 'for-3.12/wiimote' into for-linus
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/hid/hid-over-i2c.txt 28 additions, 0 deletionsDocumentation/devicetree/bindings/hid/hid-over-i2c.txt
- Documentation/hid/uhid.txt 3 additions, 1 deletionDocumentation/hid/uhid.txt
- Documentation/input/gamepad.txt 156 additions, 0 deletionsDocumentation/input/gamepad.txt
- MAINTAINERS 8 additions, 0 deletionsMAINTAINERS
- drivers/hid/Kconfig 8 additions, 0 deletionsdrivers/hid/Kconfig
- drivers/hid/Makefile 1 addition, 0 deletionsdrivers/hid/Makefile
- drivers/hid/hid-a4tech.c 4 additions, 17 deletionsdrivers/hid/hid-a4tech.c
- drivers/hid/hid-apple.c 3 additions, 13 deletionsdrivers/hid/hid-apple.c
- drivers/hid/hid-core.c 115 additions, 44 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-holtekff.c 1 addition, 1 deletiondrivers/hid/hid-holtekff.c
- drivers/hid/hid-ids.h 9 additions, 3 deletionsdrivers/hid/hid-ids.h
- drivers/hid/hid-input.c 89 additions, 3 deletionsdrivers/hid/hid-input.c
- drivers/hid/hid-kye.c 28 additions, 17 deletionsdrivers/hid/hid-kye.c
- drivers/hid/hid-logitech-dj.c 15 additions, 7 deletionsdrivers/hid/hid-logitech-dj.c
- drivers/hid/hid-magicmouse.c 4 additions, 15 deletionsdrivers/hid/hid-magicmouse.c
- drivers/hid/hid-multitouch.c 46 additions, 61 deletionsdrivers/hid/hid-multitouch.c
- drivers/hid/hid-ntrig.c 8 additions, 7 deletionsdrivers/hid/hid-ntrig.c
- drivers/hid/hid-picolcd_cir.c 2 additions, 1 deletiondrivers/hid/hid-picolcd_cir.c
- drivers/hid/hid-picolcd_core.c 1 addition, 1 deletiondrivers/hid/hid-picolcd_core.c
- drivers/hid/hid-picolcd_debugfs.c 12 additions, 11 deletionsdrivers/hid/hid-picolcd_debugfs.c
Please register or sign in to comment