diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 09:00:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 09:00:39 -0700 |
| commit | f755407dd19072b7d20719bc5454caed9ab41cc1 (patch) | |
| tree | afb1cd4f40314adb70eda77b493a09cc7c16e0d8 /drivers/scsi/dc395x.h | |
| parent | 05a88a43604abb816dfbff075bb114224641793b (diff) | |
| parent | 1deb9d341d475ff84262e927d6c0e36fecb9942e (diff) | |
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
Diffstat (limited to 'drivers/scsi/dc395x.h')
0 files changed, 0 insertions, 0 deletions