diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:05:06 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:05:06 +0200 |
commit | ef77ad5e67447b3744574c29b97da6677d6d3f18 (patch) | |
tree | 6eea09e0ca802da6c4236155b30e7a5c38c2b436 /drivers/hid | |
parent | Merge branch 'upstream' into for-linus (diff) | |
parent | HID: magicmouse: fix input registration (diff) | |
parent | HID: update BKL comment in hiddev (diff) | |
parent | HID: simplify error handling in hid_input_report() (diff) | |
parent | HID: add suspend/resume hooks for hid drivers (diff) | |
download | linux-ef77ad5e67447b3744574c29b97da6677d6d3f18.tar.xz linux-ef77ad5e67447b3744574c29b97da6677d6d3f18.zip |
Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend' into for-linus