tree afb1cd4f40314adb70eda77b493a09cc7c16e0d8
parent 05a88a43604abb816dfbff075bb114224641793b
parent 1deb9d341d475ff84262e927d6c0e36fecb9942e
author Linus Torvalds <torvalds@linux-foundation.org> 1368201639 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1368201639 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - fix usage of sleeping lock in atomic context from Jiri Kosina

 - build fix for hid-steelseries under certain .config setups by Simon Wood

 - simple mismerge fix from Fernando Luis Vázquez Cao

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: debug: fix RCU preemption issue
  HID: hid-steelseries fix led class build issue
  HID: reintroduce fix-up for certain Sony RF receivers