Merge branch 'upstream'

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

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

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

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

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

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

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

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

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