Merge remote-tracking branch 'mkp-scsi/4.5/scsi-queue' into misc
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 14 Jan 2016 00:29:30 +0000 (16:29 -0800)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 14 Jan 2016 00:29:30 +0000 (16:29 -0800)
1  2 
drivers/scsi/Kconfig

Simple merge