diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-20 08:23:53 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-20 08:23:53 +0200 |
| commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 (patch) | |
| tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 /include/drm/drm_atomic_helper.h | |
| parent | Merge tag 'drm-amdkfd-next-2015-05-19' of git://people.freedesktop.org/~gabba... (diff) | |
| parent | Linux 4.1-rc4 (diff) | |
| download | linux-bdcddf95e82b1c4e370fc1196b1f4f50f775dab4.tar.xz linux-bdcddf95e82b1c4e370fc1196b1f4f50f775dab4.zip | |
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
Diffstat (limited to 'include/drm/drm_atomic_helper.h')
0 files changed, 0 insertions, 0 deletions