diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:38:54 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:38:54 +0200 |
| commit | cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa (patch) | |
| tree | 46673a3c432958a4f712b064ddb9b645771cc0c3 /include/linux/timerqueue.h | |
| parent | Merge branch 'upstream' into for-linus (diff) | |
| parent | HID: multitouch: add support for GeneralTouch multi-touchscreen (diff) | |
Merge branch 'multitouch' into for-linus
Conflicts:
drivers/hid/hid-multitouch.c
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions