diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-07 13:53:17 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-07 13:53:17 +0200 |
| commit | 882aba01052476cbe3cd7339a3e6784b2437f18d (patch) | |
| tree | ca1b55ccac08db5edc5d141432e776f49dc2584b | |
| parent | Linux 3.1-rc5 (diff) | |
| parent | HID: wacom: Unregister sysfs attributes on remove (diff) | |
| parent | HID: magicmouse: ignore 'ivalid report id' while switching modes, v2 (diff) | |
| download | linux-882aba01052476cbe3cd7339a3e6784b2437f18d.tar.xz linux-882aba01052476cbe3cd7339a3e6784b2437f18d.zip | |
Merge branches 'upstream-fixes' and 'magicmouse' into for-linus