From 6fb39430dee2902c79501bb397befc1ca742e3eb Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 15 Feb 2013 10:11:24 +0100
Subject: [PATCH] --- yaml --- r: 352815 b: refs/heads/master c:
 6295ca184b6216ecde68f16f487a524734761adf h: refs/heads/master i:   352813:
 f610f87b826f007bf2d7bfc327d9db51be1ab9bd   352811:
 5fe1dd607b1e14fde3c720b5b4ae66a2205c3251   352807:
 b40400eccc50b48c4a4d7c88eca60bbf78451bfe   352799:
 e457a6e40b20e0675ec3c039d00655ae79eeb493 v: v3

---
 [refs]                                 | 2 +-
 trunk/Documentation/DocBook/80211.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7a50c9816bbe..7f5ae6abd3ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15ac7c478fd227257e4be94519c6f965a9e6159d
+refs/heads/master: 6295ca184b6216ecde68f16f487a524734761adf
diff --git a/trunk/Documentation/DocBook/80211.tmpl b/trunk/Documentation/DocBook/80211.tmpl
index 42e7f030cb16..284ced7a228f 100644
--- a/trunk/Documentation/DocBook/80211.tmpl
+++ b/trunk/Documentation/DocBook/80211.tmpl
@@ -107,8 +107,8 @@
 !Finclude/net/cfg80211.h key_params
 !Finclude/net/cfg80211.h survey_info_flags
 !Finclude/net/cfg80211.h survey_info
-!Finclude/net/cfg80211.h beacon_parameters
-!Finclude/net/cfg80211.h plink_actions
+!Finclude/net/cfg80211.h cfg80211_beacon_data
+!Finclude/net/cfg80211.h cfg80211_ap_settings
 !Finclude/net/cfg80211.h station_parameters
 !Finclude/net/cfg80211.h station_info_flags
 !Finclude/net/cfg80211.h rate_info_flags