diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-09 01:45:37 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-09 01:45:37 +0200 |
commit | 3d0283ebc8718f793a14971041b1c99afce714ac (patch) | |
tree | fef9bfe74cf58d6ee3e588e522584f8a51726025 /drivers/base | |
parent | Merge branch 'for-31-rc5/i2c-fixes' of git://git.fluff.org/bjdooks/linux (diff) | |
parent | Merge branches 'upstream-fixes' and 'magicmouse' into for-linus (diff) | |
download | linux-3d0283ebc8718f793a14971041b1c99afce714ac.tar.xz linux-3d0283ebc8718f793a14971041b1c99afce714ac.zip |
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