diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-12-12 21:41:55 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-12-12 21:41:55 +0100 |
| commit | 818b930bc15077fc00ff16bb22c5df1857f05afa (patch) | |
| tree | d799c1037eb55e5f8bdecf72d5fdd45ab4f57569 /drivers/input/misc/Makefile | |
| parent | HID: Add Apple wireless keyboard 2011 ANSI to special driver list (diff) | |
| parent | HID: hidraw: fix signaling SIGIO when hidraw reports an event (diff) | |
| parent | HID: i2c-hid: add mutex protecting open/close race (diff) | |
| parent | HID: multitouch: fix Win 8 protocol (diff) | |
| parent | HID: roccat: fix wrong attr size for koneplus tcu (diff) | |
| parent | Revert "HID: sensors: add to special driver list" (diff) | |
| parent | HID: hidp: fallback to input session properly if hid is blacklisted (diff) | |
| download | linux-dev-818b930bc15077fc00ff16bb22c5df1857f05afa.tar.xz linux-dev-818b930bc15077fc00ff16bb22c5df1857f05afa.zip | |
Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c