HID: Merge branch 'master' into for-3.10/hid-driver-transport-cleanups
authorJiri Kosina <jkosina@suse.cz>
Sat, 9 Mar 2013 09:58:13 +0000 (10:58 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sat, 9 Mar 2013 10:01:06 +0000 (11:01 +0100)
commit83a44ac8bf4a8e6cbbf0c00ff281a482778f708a
tree325be1e4d52372db888396549908f25c5370caee
parent4ba25d3f87fe3ed6634f61da2a6904e2dfd09192
parentd381f45c890a3fb136afb0dc1cbe025e066cb981
HID: Merge branch 'master' into for-3.10/hid-driver-transport-cleanups

Sync with Linus' tree. This is necessary to resolve build conflict
caused by dcd9006b1b053c7b ("HID: logitech-dj: do not directly call
hid_output_raw_report() during probe") which issues direct call to
usbhid_submit_report(), but that is gone in this branch and
hid_hw_request() has to be used instead.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-core.c
drivers/hid/hid-logitech-dj.c