tree 0b419af2c3f3d225148c38228ed6d95fae7269da
parent bf6c8a81481397e0c53b0a91941d945c785356be
parent c284979affcc6870a9a6545fc4b1adb3816dfcbf
author Linus Torvalds <torvalds@linux-foundation.org> 1359668699 +1100
committer Linus Torvalds <torvalds@linux-foundation.org> 1359668699 +1100

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