Jiri Kosina ec3b34e197 Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus ...

Conflicts:
	drivers/hid/wacom_wac.c

2015-06-22 16:23:43 +02:00

..

i2c-hid

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

usbhid

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hid-a4tech.c

…

hid-apple.c

…

hid-appleir.c

…

hid-aureal.c

…

hid-axff.c

…

hid-belkin.c

…

hid-betopff.c

…

hid-cherry.c

…

hid-chicony.c

…

hid-core.c

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hid-cp2112.c

…

hid-cypress.c

HID: cypress: use swap() in cp_report_fixup()

2015-06-18 11:00:42 +02:00

hid-debug.c

…

hid-dr.c

…

hid-elecom.c

…

hid-elo.c

…

hid-emsff.c

…

hid-ezkey.c

…

hid-gaff.c

…

hid-generic.c

…

hid-gt683r.c

…

hid-gyration.c

…

hid-holtek-kbd.c

…

hid-holtek-mouse.c

…

hid-holtekff.c

…

hid-hyperv.c

…

hid-icade.c

…

hid-ids.h

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hid-input.c

HID: hid-input: Fix coding style issue

2015-05-28 10:41:45 +02:00

hid-kensington.c

…

hid-keytouch.c

…

hid-kye.c

…

hid-lcpower.c

…

hid-lenovo.c

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hid-lg2ff.c

…

hid-lg3ff.c

…

hid-lg4ff.c

…

hid-lg4ff.h

…

hid-lg.c

…

hid-lg.h

…

hid-lgff.c

…

hid-logitech-dj.c

…

hid-logitech-hidpp.c

Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus

2015-06-22 16:22:06 +02:00

hid-magicmouse.c

…

hid-microsoft.c

HID: microsoft: Add Surface Power Cover

2015-06-18 10:56:16 +02:00

hid-monterey.c

…

hid-multitouch.c

…

hid-ntrig.c

…

hid-ortek.c

…

hid-penmount.c

…

hid-petalynx.c

…

hid-picolcd_backlight.c

…

hid-picolcd_cir.c

…

hid-picolcd_core.c

…

hid-picolcd_debugfs.c

…

hid-picolcd_fb.c

…

hid-picolcd_lcd.c

…

hid-picolcd_leds.c

…

hid-picolcd.h

…

hid-pl.c

…

hid-plantronics.c

HID: plantronics: Update to map volume up/down controls

2015-06-12 15:04:17 +02:00

hid-primax.c

…

hid-prodikeys.c

…

hid-rmi.c

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hid-roccat-arvo.c

…

hid-roccat-arvo.h

…

hid-roccat-common.c

…

hid-roccat-common.h

…

hid-roccat-isku.c

…

hid-roccat-isku.h

…

hid-roccat-kone.c

…

hid-roccat-kone.h

…

hid-roccat-koneplus.c

…

hid-roccat-koneplus.h

…

hid-roccat-konepure.c

…

hid-roccat-kovaplus.c

…

hid-roccat-kovaplus.h

…

hid-roccat-lua.c

…

hid-roccat-lua.h

…

hid-roccat-pyra.c

…

hid-roccat-pyra.h

…

hid-roccat-ryos.c

…

hid-roccat-savu.c

…

hid-roccat-savu.h

…

hid-roccat.c

…

hid-saitek.c

…

hid-samsung.c

…

hid-sensor-custom.c

…

hid-sensor-hub.c

…

hid-sjoy.c

…

hid-sony.c

HID: hid-sony: Fix report descriptor for Navigation Controller

2015-06-18 10:45:58 +02:00

hid-speedlink.c

…

hid-steelseries.c

…

hid-sunplus.c

…

hid-thingm.c

…

hid-tivo.c

…

hid-tmff.c

…

hid-topseed.c

…

hid-twinhan.c

…

hid-uclogic.c

…

hid-waltop.c

…

hid-wiimote-core.c

…

hid-wiimote-debug.c

…

hid-wiimote-modules.c

…

hid-wiimote.h

…

hid-xinmo.c

…

hid-zpff.c

…

hid-zydacron.c

…

hidraw.c

…

Kconfig

HID: plantronics: Update to map volume up/down controls

2015-06-12 15:04:17 +02:00

Makefile

HID: Makefile: fix alignment of objs-* entries

2015-05-26 15:32:38 +02:00

uhid.c

…

wacom_sys.c

HID: wacom: Introduce new 'touch_input' device

2015-06-18 10:42:40 +02:00

wacom_wac.c

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

wacom_wac.h

HID: wacom: Introduce new 'touch_input' device

2015-06-18 10:42:40 +02:00

wacom.h

HID: wacom: Split apart 'wacom_setup_pentouch_input_capabilites'

2015-06-18 10:42:39 +02:00