]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5058701 e3840a5)
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)
commitd86f4c54ac0592de38c1ec744e71d091fdb29664
tree325be1e4d52372db888396549908f25c5370caeetree | snapshot
parent50587012dac5c2d6909c0f2a080034afe0da291fcommit | diff
parente3840a53d8d0f85783cefb50f7f9cda6d2873c86commit | 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 67a9a03e7691bfad ("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 diff1 | diff2 | blob | history
drivers/hid/hid-logitech-dj.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.