diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:31:13 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:31:13 +0200 |
| commit | ada8c7973b65865cf0436b73898e32992860012a (patch) | |
| tree | dad7fb8494a0e4ea4734ed1d25c876205c6701c3 /drivers/hid/hid-ids.h | |
| parent | Merge branch 'acrux' into for-linus (diff) | |
| parent | HID: magicmouse: Correct parsing of large X and Y motions. (diff) | |
| parent | HID: roccat: remove obsolete kone_abi_version sysfs attribute (diff) | |
| parent | HID: Force input registration for "VEC footpedal" (diff) | |
| download | linux-ada8c7973b65865cf0436b73898e32992860012a.tar.xz linux-ada8c7973b65865cf0436b73898e32992860012a.zip | |
Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus
Conflicts:
drivers/hid/hid-ids.h