From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 9 Mar 2013 09:58:13 +0000 (+0100)
Subject: HID: Merge branch 'master' into for-3.10/hid-driver-transport-cleanups
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~105^2~3^3~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83a44ac8bf4a8e6cbbf0c00ff281a482778f708a;p=pandora-kernel.git

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>
---

83a44ac8bf4a8e6cbbf0c00ff281a482778f708a
Reading git-diff-tree failed