diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 17:41:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 17:41:56 +0200 |
commit | f45471cbda9df24f990154a963741c9bd4c0b0aa (patch) | |
tree | 145ed5450efae53f73ae0dca263b84688d6b97ca /arch/s390/mm/cmm.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
parent | HID: roccat: fix build failure if built as module (diff) | |
download | linux-f45471cbda9df24f990154a963741c9bd4c0b0aa.tar.xz 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 'arch/s390/mm/cmm.c')
0 files changed, 0 insertions, 0 deletions