diff options
| author | Linus Torvalds <[email protected]> | 2016-02-19 00:24:48 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-02-19 00:24:48 +0000 |
| commit | dd8fc10e606127e2dffdb6704e7ec203c86a214d (patch) | |
| tree | 72f58ab97c144c95af2623de884745fdb4e9cc68 /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| parent | Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes (diff) | |
| download | kernel-dd8fc10e606127e2dffdb6704e7ec203c86a214d.tar.gz kernel-dd8fc10e606127e2dffdb6704e7ec203c86a214d.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two simple fixes.
One prevents a soft lockup on some target removal scenarios and the
other prevents us trying to probe the marvell console device, which
causes it to time out and need the bus resetting"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: fix soft lockup in scsi_remove_target() on module removal
SCSI: Add Marvell configuration device to VPD blacklist
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
0 files changed, 0 insertions, 0 deletions