diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-02-21 10:45:01 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-21 10:45:01 +0100 |
| commit | 73759518d6d6b56e398791b7522328baf4181a82 (patch) | |
| tree | a91375dfdb9f3aff472ceef897f5c076d40763a5 /include | |
| parent | 539cf54bdd922474d22585837c9fec3343d7061b (diff) | |
| parent | 483f86a54c6d89f16da2e53f2b7b6205b34756df (diff) | |
| parent | 7e3cc447ff8906558619b1ecc46e4bd776a4f3a6 (diff) | |
| parent | 1b474fe82d4eed3c909f02be82586284827c1705 (diff) | |
| parent | 30ba2fbde1840db440915491cdde235b72a11384 (diff) | |
Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus