Merge remote-tracking branch 'isci/all'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/scsi/ipr.c
Simple merge

diff --cc drivers/scsi/isci/request.c
Simple merge

diff --cc drivers/scsi/mvsas/mv_sas.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc fs/sysfs/dir.c
Simple merge

diff --cc lib/kobject.c
Simple merge