Merge branch 'master'

Conflicts:

	drivers/scsi/libata-scsi.c
	include/linux/libata.h

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

diff --cc drivers/scsi/ata_piix.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_nv.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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