First attempt at pulling 4310 fix from Andy Giles tree

@@ -1014,10 +1014,12 @@
  */
 #define MPTSAS_SS_DRAINING              0x02
 #define MPTSAS_SS_QUIESCED              0x04
 #define MPTSAS_SS_MSG_UNIT_RESET        0x08
 #define MPTSAS_DID_MSG_UNIT_RESET       0x10
+#define MPTSAS_SS_RESET_INWATCH         0x20
+#define MPTSAS_SS_MUR_INWATCH           0x40
 
 /*
  * regspec defines.
  */
 #define CONFIG_SPACE    0       /* regset[0] - configuration space */