diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:41:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:41:56 -0700 |
| commit | f45471cbda9df24f990154a963741c9bd4c0b0aa (patch) | |
| tree | 145ed5450efae53f73ae0dca263b84688d6b97ca /fs/ncpfs/file.c | |
| parent | 2214482cb00e6da1397c2ecde5b392490eb9637f (diff) | |
| parent | 0e927bfc87037c1f44d6b61be12c36f6215ee5b2 (diff) | |
| download | blackbird-op-linux-f45471cbda9df24f990154a963741c9bd4c0b0aa.tar.gz blackbird-op-linux-f45471cbda9df24f990154a963741c9bd4c0b0aa.zip | |
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: roccat: fix build failure if built as module
HID: roccat: propagate special events of roccat hardware to userspace
HID: Add the GYR4101US USB ID to hid-gyration
HID: fix hid-roccat-kone for bin_attr API change
Diffstat (limited to 'fs/ncpfs/file.c')
0 files changed, 0 insertions, 0 deletions
