| commit | 83a44ac8bf4a8e6cbbf0c00ff281a482778f708a | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Sat Mar 09 10:58:13 2013 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Sat Mar 09 11:01:06 2013 +0100 |
| tree | 325be1e4d52372db888396549908f25c5370caee | |
| parent | 4ba25d3f87fe3ed6634f61da2a6904e2dfd09192 [diff] | |
| parent | d381f45c890a3fb136afb0dc1cbe025e066cb981 [diff] |
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>