Merge SCSI misc branch into isci-for-3.6 tag

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

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

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

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_base.c
Simple merge

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

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

diff --cc include/linux/pci_ids.h
Simple merge