diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:17:48 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:17:48 +0200 |
| commit | 72c16d9a5c303dce928a52a8861fe7a2a25f849a (patch) | |
| tree | b38d03007abcfadf12619d422169a6d4d4000ce7 /drivers/hid/hid-roccat.c | |
| parent | Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver... (diff) | |
| parent | HID: multitouch: force BTN_STYLUS for pen devices (diff) | |
| download | linux-72c16d9a5c303dce928a52a8861fe7a2a25f849a.tar.xz linux-72c16d9a5c303dce928a52a8861fe7a2a25f849a.zip | |
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
Conflicts:
drivers/hid/hid-multitouch.c
Diffstat (limited to 'drivers/hid/hid-roccat.c')
0 files changed, 0 insertions, 0 deletions