diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:41:22 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:41:22 +0200 |
| commit | 3390e579b3dac71e630ed879a73c5ac3b4447045 (patch) | |
| tree | fcd7f4118654286c1e634c87e4ad3efcea3c637d /scripts/gdb/linux/utils.py | |
| parent | Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for-4.7/thingm' into for-linus (diff) | |
| parent | HID: usbhid: quirks for Corsair RGB keyboard & mice (K70R, K95RGB, M65RGB, K70RGB, K65RGB) (diff) | |
| download | linux-rng-3390e579b3dac71e630ed879a73c5ac3b4447045.tar.xz linux-rng-3390e579b3dac71e630ed879a73c5ac3b4447045.zip | |
Merge branch 'for-4.7/upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'scripts/gdb/linux/utils.py')
0 files changed, 0 insertions, 0 deletions