Merge branch 'fixes-base' into fixes
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 5 Apr 2016 10:56:47 +0000 (06:56 -0400)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 5 Apr 2016 10:56:47 +0000 (06:56 -0400)
1  2 
drivers/scsi/cxlflash/main.c

Simple merge