diff --git a/[refs] b/[refs]
index aa63f01867e8..6856f849fc3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb041a0e9c31229071b6e56e1d0d8374af0d2038
+refs/heads/master: 05a2a17317b48eb16a167c8c2932ba7b3cdee89e
diff --git a/trunk/include/scsi/sas.h b/trunk/include/scsi/sas.h
index 07d504f3981c..cfdbe9501593 100644
--- a/trunk/include/scsi/sas.h
+++ b/trunk/include/scsi/sas.h
@@ -108,6 +108,7 @@ enum sas_protocol {
 	SAS_PROTOCOL_STP		= 0x04,
 	SAS_PROTOCOL_SSP		= 0x08,
 	SAS_PROTOCOL_ALL		= 0x0E,
+	SAS_PROTOCOL_STP_ALL		= SAS_PROTOCOL_STP|SAS_PROTOCOL_SATA,
 };
 
 /* From the spec; local phys only */