summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 14:05:06 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-19 14:05:06 +0200
commitef77ad5e67447b3744574c29b97da6677d6d3f18 (patch)
tree6eea09e0ca802da6c4236155b30e7a5c38c2b436 /drivers/hid
parentMerge branch 'upstream' into for-linus (diff)
parentHID: magicmouse: fix input registration (diff)
parentHID: update BKL comment in hiddev (diff)
parentHID: simplify error handling in hid_input_report() (diff)
parentHID: add suspend/resume hooks for hid drivers (diff)
downloadlinux-ef77ad5e67447b3744574c29b97da6677d6d3f18.tar.xz
linux-ef77ad5e67447b3744574c29b97da6677d6d3f18.zip
Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend' into for-linus