diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 08:04:25 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 08:04:25 -0400 |
| commit | 3abee3526d381e33a391362b01dc8b17d377076d (patch) | |
| tree | 48e049e8df0a9059133672dd7bf4e0e4871f00a1 /drivers/hid/usbhid | |
| parent | 550cf00dbc8ee402bef71628cb71246493dd4500 (diff) | |
| parent | 45d9c273b262cde84bb6bb3fc02c01d07da76936 (diff) | |
| parent | 765031668fb2b064aebd9a568e5ad794cbe3413a (diff) | |
| parent | 9e87f22ac6353b50425c5da412fe2418a48e25a3 (diff) | |
Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus