diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
| commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 (patch) | |
| tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 /include/scsi/scsi_transport_srp.h | |
| 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
Diffstat (limited to 'include/scsi/scsi_transport_srp.h')
0 files changed, 0 insertions, 0 deletions