Merge branch 'upstream-fixes'

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

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

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

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

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