summaryrefslogtreecommitdiffstats
path: root/Documentation/ABI
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-08-04 15:31:13 +0200
committerJiri Kosina <jkosina@suse.cz>2010-08-04 15:31:13 +0200
commitada8c7973b65865cf0436b73898e32992860012a (patch)
treedad7fb8494a0e4ea4734ed1d25c876205c6701c3 /Documentation/ABI
parentMerge branch 'acrux' into for-linus (diff)
parentHID: magicmouse: Correct parsing of large X and Y motions. (diff)
parentHID: roccat: remove obsolete kone_abi_version sysfs attribute (diff)
parentHID: Force input registration for "VEC footpedal" (diff)
downloadlinux-ada8c7973b65865cf0436b73898e32992860012a.tar.xz
linux-ada8c7973b65865cf0436b73898e32992860012a.zip
Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus
Conflicts: drivers/hid/hid-ids.h