diff options
| author | Jiri Kosina <[email protected]> | 2016-05-17 10:41:22 +0000 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2016-05-17 10:41:22 +0000 |
| commit | 3390e579b3dac71e630ed879a73c5ac3b4447045 (patch) | |
| tree | fcd7f4118654286c1e634c87e4ad3efcea3c637d /drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |
| parent | Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and... (diff) | |
| parent | HID: usbhid: quirks for Corsair RGB keyboard & mice (K70R, K95RGB, M65RGB, K7... (diff) | |
| download | kernel-3390e579b3dac71e630ed879a73c5ac3b4447045.tar.gz kernel-3390e579b3dac71e630ed879a73c5ac3b4447045.zip | |
Merge branch 'for-4.7/upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c')
0 files changed, 0 insertions, 0 deletions