diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 23:52:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 23:52:31 (GMT) |
| commit | c6b9e73f2fee8bb86058f296de808b326473456b (patch) | |
| tree | e2f71a4f3aa209afac3009ffe9de2985ad477fe3 /include/linux/resume-trace.h | |
| parent | 441f4058a04b2943685ff94e0f5f1992b0b3649e (diff) | |
| parent | e639ba481b76e445df354acd6e29d859a9b1657f (diff) | |
| download | linux-fsl-qoriq-c6b9e73f2fee8bb86058f296de808b326473456b.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: avoid '\0' in hid debugfs events file
HID: Add RGT Clutch Wheel clutch device id
HID: ntrig: fix touch events
HID: add quirk for UC-Logik WP4030 tablet
HID: magicmouse: fix oops after device removal
Diffstat (limited to 'include/linux/resume-trace.h')
0 files changed, 0 insertions, 0 deletions