| commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed May 20 16:23:53 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed May 20 16:23:53 2015 +1000 |
| tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 | |
| parent | 91d9f9856f91c82ac6289a0fff65dd12cfa07e34 [diff] | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 [diff] |
Backmerge v4.1-rc4 into into drm-next We picked up a silent conflict in amdkfd with drm-fixes and drm-next, backmerge v4.1-rc5 and fix the conflicts Signed-off-by: Dave Airlie <airlied@redhat.com> Conflicts: drivers/gpu/drm/drm_irq.c