diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-31 22:44:59 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-31 22:44:59 +0100 |
commit | cf5425bfcd6909f9831a00bc06ccb9a5b163766a (patch) | |
tree | 0b419af2c3f3d225148c38228ed6d95fae7269da /Documentation | |
parent | Merge tag 'nfs-for-3.8-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
parent | HID: i2c-hid: fix i2c_hid_output_raw_report (diff) | |
download | linux-cf5425bfcd6909f9831a00bc06ccb9a5b163766a.tar.xz linux-cf5425bfcd6909f9831a00bc06ccb9a5b163766a.zip |
Merge branch 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
PullHID fixes from Jiri Kosina:
- fix i2c-hid and hidraw interaction, by Benjamin Tissoires
- a quirk to make a particular device (Formosa IR receiver) work
properly, by Nicholas Santos
* 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: i2c-hid: fix i2c_hid_output_raw_report
HID: usbhid: quirk for Formosa IR receiver
HID: remove x bit from sensor doc
Diffstat (limited to 'Documentation')
-rw-r--r--[-rwxr-xr-x] | Documentation/hid/hid-sensor.txt | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/Documentation/hid/hid-sensor.txt b/Documentation/hid/hid-sensor.txt index 948b0989c433..948b0989c433 100755..100644 --- a/Documentation/hid/hid-sensor.txt +++ b/Documentation/hid/hid-sensor.txt |