diff --git a/[refs] b/[refs]
index 116d73c6c7d4..8cc70809a5a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebcad5aaea26da3cb2ca90b7f31a67a027eb60db
+refs/heads/master: d42ad15b759d05a87f22b484af63987eff38ea88
diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h
index 08a86d5cdf1b..9a061accd8b8 100644
--- a/trunk/include/linux/ata.h
+++ b/trunk/include/linux/ata.h
@@ -89,6 +89,8 @@ enum {
 	ATA_ID_DLF		= 128,
 	ATA_ID_CSFO		= 129,
 	ATA_ID_CFA_POWER	= 160,
+	ATA_ID_CFA_KEY_MGMT	= 162,
+	ATA_ID_CFA_MODES	= 163,
 	ATA_ID_ROT_SPEED	= 217,
 	ATA_ID_PIO4		= (1 << 1),