diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:05:18 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:05:18 +0100 |
| commit | 77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51 (patch) | |
| tree | b7a0675903455d2affe832e9da594cdcf94d2e56 /drivers | |
| parent | 3abee3526d381e33a391362b01dc8b17d377076d (diff) | |
| parent | bd393dbd33aeae0bb239f3c69938d37cc55193ca (diff) | |
| parent | 7e503a37deee55cc30d2c8643e704a98556dd367 (diff) | |
Merge branches 'roccat' and 'wacom' into for-linus