summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-09-07 13:53:17 +0200
committerJiri Kosina <jkosina@suse.cz>2011-09-07 13:53:17 +0200
commit882aba01052476cbe3cd7339a3e6784b2437f18d (patch)
treeca1b55ccac08db5edc5d141432e776f49dc2584b /drivers/hid
parentddf28352b80c86754a6424e3a61e8bdf9213b3c7 (diff)
parent9086617ea3a7f3e574ca64392b827bdd56f607eb (diff)
parent35d851df23b093ee027f827fed2213ae5e88fc7a (diff)
Merge branches 'upstream-fixes' and 'magicmouse' into for-linus