diff options
| author | Jiri Kosina | 2013-07-04 15:02:26 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2013-07-04 15:02:26 +0200 |
| commit | 08ec2dcc3527a20c619aca2fb36f800908256bac (patch) | |
| tree | b39578fe388ab30ba03d4f1dffa9b7be801262d3 | |
| parent | Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for... (diff) | |
| parent | HID: remove duplicate ID for D-WAV eGalax 0x7224 (diff) | |
| parent | HID: fold ps3remote driver into generic Sony driver (diff) | |
| parent | HID: kye: Add report fixup for Genius Gila Gaming mouse (diff) | |
| download | kernel-qcow2-linux-08ec2dcc3527a20c619aca2fb36f800908256bac.tar.gz kernel-qcow2-linux-08ec2dcc3527a20c619aca2fb36f800908256bac.tar.xz kernel-qcow2-linux-08ec2dcc3527a20c619aca2fb36f800908256bac.zip | |
Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c