From: Tejun Heo <tj@kernel.org>
Date: Tue, 24 Mar 2015 18:27:42 +0000 (-0400)
Subject: Merge branch 'for-4.1' into for-next
X-Git-Tag: KARO-TXA5-2015-06-26~98^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c1d28989c1bd0bedba29e3a4c95e963c9225bc1;p=karo-tx-linux.git

Merge branch 'for-4.1' into for-next

Conflicts:
	include/linux/libata.h
---

8c1d28989c1bd0bedba29e3a4c95e963c9225bc1
diff --cc include/linux/libata.h
index 6b08cc106c21,ebe132a4873c..2753cc06f68e
--- a/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 */