| commit | cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Mon Oct 01 14:38:54 2012 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Mon Oct 01 14:38:54 2012 +0200 |
| tree | 46673a3c432958a4f712b064ddb9b645771cc0c3 | |
| parent | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 [diff] | |
| parent | f5ff4e1e62408327d27fb1e1ab00e96a52b7cd46 [diff] |
Merge branch 'multitouch' into for-linus Conflicts: drivers/hid/hid-multitouch.c