Merge branch 'for-4.1' into for-next

Conflicts:
	include/linux/libata.h

diff --cc include/linux/libata.h
index 6b08cc106c218dc06d60988663c4bcac3eaba5fe,ebe132a4873cb28ae2596e7064789b06ce85eb98..2753cc06f68ec174daebe1259c796d43f121e621
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -231,8 -231,6 +231,7 @@@ enum 
        ATA_FLAG_SW_ACTIVITY    = (1 << 22), /* driver supports sw activity
                                              * led */
        ATA_FLAG_NO_DIPM        = (1 << 23), /* host not happy with DIPM */
-       ATA_FLAG_LOWTAG         = (1 << 24), /* host wants lowest available tag */
 +      ATA_FLAG_SAS_HOST       = (1 << 25), /* SAS host */
  
        /* bits 24:31 of ap->flags are reserved for LLD specific flags */