diff --git a/[refs] b/[refs]
index 561b9008a748..052e43b5c369 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66572cfc30a4b764150c83ee5d842a3ce17991c9
+refs/heads/master: c2ebea2097f84f0973c58b8467c1a2236bbb307a
diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h
index 6e0601189db9..318fc1f705b1 100644
--- a/trunk/include/linux/ieee80211.h
+++ b/trunk/include/linux/ieee80211.h
@@ -1633,6 +1633,8 @@ enum ieee80211_sa_query_action {
 #define WLAN_OUI_TYPE_WFA_P2P		9
 #define WLAN_OUI_MICROSOFT		0x0050f2
 #define WLAN_OUI_TYPE_MICROSOFT_WPA	1
+#define WLAN_OUI_TYPE_MICROSOFT_WMM	2
+#define WLAN_OUI_TYPE_MICROSOFT_WPS	4
 
 /*
  * WMM/802.11e Tspec Element