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: betop: add drivers/hid/hid-betopff.c	2014-12-22 15:00:25 +01:00
hid-cherry.c	HID: fix a couple of off-by-ones	2014-08-21 10:43:28 -05:00
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	driver:gpio remove all usage of gpio_remove retval in driver	2014-09-18 11:03:10 -07:00
hid-cypress.c	HID: cypress: use swap() in cp_report_fixup()	2015-06-18 11:00:42 +02:00
hid-debug.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-04-14 18:25:15 -07:00
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: gt683r: move mode attribute to led-class devices	2014-07-03 11:14:11 -07:00
hid-gyration.c
hid-holtek-kbd.c
hid-holtek-mouse.c	HID: Add Holtek USB ID 04d9:a0c2 ETEKCITY Scroll	2014-09-08 09:48:56 +02:00
hid-holtekff.c
hid-hyperv.c	HID: hyperv: match wait_for_completion_timeout return type	2015-01-26 14:25:41 +01:00
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: kye: Fix report descriptor for Genius PenSketch M912	2015-02-17 13:13:45 +01:00
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-lg.c	HID: hid-lg: Only one of LG_FF flags can be set for a given device	2015-05-07 16:27:18 +02:00
hid-lg.h	HID: hid-lg4ff: Introduce a module parameter to disable automatic switch of compatibility mode	2015-02-18 21:14:54 +01:00
hid-lg2ff.c
hid-lg3ff.c
hid-lg4ff.c	HID: hid-lg4ff: Allow the driver to continue without sysfs interface	2015-05-07 16:27:17 +02:00
hid-lg4ff.h	HID: hid-lg4ff: Remove double underscore prefix from numeric types	2015-05-07 16:27:07 +02:00
hid-lgff.c
hid-logitech-dj.c	HID: logitech-dj: check report length	2014-12-17 08:50:12 +01:00
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: magicmouse: sanity check report size in raw_event() callback	2014-08-27 09:14:39 +02:00
hid-microsoft.c	HID: microsoft: Add Surface Power Cover	2015-06-18 10:56:16 +02:00
hid-monterey.c	HID: fix a couple of off-by-ones	2014-08-21 10:43:28 -05:00
hid-multitouch.c	Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic-merge', 'for-4.1/i2c-hid', 'for-4.1/kconfig-drop-expert-dependency', 'for-4.1/logitech', 'for-4.1/multitouch', 'for-4.1/rmi', 'for-4.1/sony', 'for-4.1/upstream' and 'for-4.1/wacom' into for-linus	2015-04-13 23:41:15 +02:00
hid-ntrig.c
hid-ortek.c
hid-penmount.c	HID: add support for PenMount HID TouchScreen Driver	2014-09-04 11:23:51 +02:00
hid-petalynx.c	HID: fix a couple of off-by-ones	2014-08-21 10:43:28 -05:00
hid-picolcd.h
hid-picolcd_backlight.c
hid-picolcd_cir.c	[media] rc-core: remove protocol arrays	2014-07-25 19:10:43 -03:00
hid-picolcd_core.c	HID: picolcd: be more verbose when reporting report size error	2014-08-27 23:27:10 +02:00
hid-picolcd_debugfs.c	HID: picolcd: remove unnecessary NULL test before debugfs_remove	2014-06-30 09:54:22 +02:00
hid-picolcd_fb.c
hid-picolcd_lcd.c
hid-picolcd_leds.c
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: prodikeys: remove unused variable	2015-05-07 10:33:58 +02:00
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: Fix code style issues	2014-10-29 14:56:30 +01:00
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: Drop cast	2014-06-27 00:33:44 +02:00
hid-roccat-lua.h
hid-roccat-pyra.c	HID: roccat: potential out of bounds in pyra_sysfs_write_settings()	2015-01-09 14:41:01 +01:00
hid-roccat-pyra.h
hid-roccat-ryos.c
hid-roccat-savu.c
hid-roccat-savu.h
hid-roccat.c
hid-saitek.c	HID: saitek: add USB ID for older R.A.T. 7	2015-02-17 13:28:00 +01:00
hid-samsung.c
hid-sensor-custom.c	HID: sensor: Custom and Generic sensor support	2015-04-10 22:22:55 +02:00
hid-sensor-hub.c	HID: hid-sensor-hub: Fix debug lock warning	2015-05-12 14:13:20 +02:00
hid-sjoy.c	HID: sjoy: support Super Joy Box 4	2015-05-07 10:47:53 +02:00
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: remove 2 unused usb.h includes	2015-02-27 00:36:23 +01:00
hid-sunplus.c	HID: fix a couple of off-by-ones	2014-08-21 10:43:28 -05:00
hid-thingm.c	Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus	2014-10-06 23:34:40 +02:00
hid-tivo.c	HID: tivo: enable all buttons on the TiVo Slide Pro remote	2015-03-15 10:04:27 -04:00
hid-tmff.c
hid-topseed.c
hid-twinhan.c
hid-uclogic.c	HID: uclogic: make input_mapping independent of usb	2015-03-16 15:46:47 +01:00
hid-waltop.c
hid-wiimote-core.c
hid-wiimote-debug.c
hid-wiimote-modules.c	power_supply: Change ownership from driver to core	2015-03-13 23:15:51 +01:00
hid-wiimote.h	power_supply: Change ownership from driver to core	2015-03-13 23:15:51 +01:00
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	HID: uHID: fix excepted report type	2014-10-01 20:58:46 +02:00
wacom.h	HID: wacom: Split apart 'wacom_setup_pentouch_input_capabilites'	2015-06-18 10:42:39 +02:00
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