diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 16:38:54 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 16:38:54 +0400 |
| commit | cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa (patch) | |
| tree | 46673a3c432958a4f712b064ddb9b645771cc0c3 /include | |
| parent | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (diff) | |
| parent | f5ff4e1e62408327d27fb1e1ab00e96a52b7cd46 (diff) | |
| download | linux-cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa.tar.xz | |
Merge branch 'multitouch' into for-linus
Conflicts:
drivers/hid/hid-multitouch.c
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions