diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-08 19:45:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-08 19:45:37 -0400 |
commit | 3d0283ebc8718f793a14971041b1c99afce714ac (patch) | |
tree | fef9bfe74cf58d6ee3e588e522584f8a51726025 /drivers/base | |
parent | 4dcaadc3193d494baed79dc2055a6eefbebe0454 (diff) | |
parent | 882aba01052476cbe3cd7339a3e6784b2437f18d (diff) |
Merge branch 'for-linus' of git://twin.jikos.cz/jikos/hid
* 'for-linus' of git://twin.jikos.cz/jikos/hid:
HID: wacom: Unregister sysfs attributes on remove
HID: wacom: Fix error path of power-supply initialization
HID: add support for HuiJia USB Gamepad connector
HID: magicmouse: ignore 'ivalid report id' while switching modes, v2
HID: magicmouse: Set resolution of touch surfaces
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions