diff options
| author | Jiri Kosina | 2014-04-01 19:06:41 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2014-04-01 19:06:41 +0200 |
| commit | 6cf8c85f8bc320ca0273c5261cc13ee1491d7b92 (patch) | |
| tree | 418b338bcb2014768ede10e73179c7afbaf1736d /drivers/hid/hid-multitouch.c | |
| parent | Merge branch 'for-3.15/hid-sensor-hub' into for-linus (diff) | |
| parent | HID: hid-microsoft: Add support for 2 reserved usage ids used on ms office kb (diff) | |
| download | kernel-qcow2-linux-6cf8c85f8bc320ca0273c5261cc13ee1491d7b92.tar.gz kernel-qcow2-linux-6cf8c85f8bc320ca0273c5261cc13ee1491d7b92.tar.xz kernel-qcow2-linux-6cf8c85f8bc320ca0273c5261cc13ee1491d7b92.zip | |
Merge branch 'for-3.15/microsoft' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
0 files changed, 0 insertions, 0 deletions