diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-07-04 15:05:02 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-07-04 15:05:02 +0200 |
| commit | 21796b39c9e876a46a353a4a9ff9881766a7c176 (patch) | |
| tree | 119e93184ba04e6cee5798cfd28686100899db1e /drivers/hid/hid-a4tech.c | |
| parent | Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream'... (diff) | |
| parent | HID: wacom: Intuos4 battery charging changes (diff) | |
| parent | HID: wiimote: support Nintendo Wii U Pro Controller (diff) | |
| download | linux-21796b39c9e876a46a353a4a9ff9881766a7c176.tar.gz linux-21796b39c9e876a46a353a4a9ff9881766a7c176.zip | |
Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus