diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:02 -0400 |
| commit | c78b3841fac9a59c7494be143aa7f2e69ea47958 (patch) | |
| tree | 503c1279d2bdf8b295ba7d2eb81830c5eb6bfb32 /Documentation | |
| parent | 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff) | |
| parent | f00f188f8212fec9976394976c4fd5d4a3bc4dcf (diff) | |
| download | op-kernel-dev-c78b3841fac9a59c7494be143aa7f2e69ea47958.zip op-kernel-dev-c78b3841fac9a59c7494be143aa7f2e69ea47958.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl index 284ced7..0f6a3ed 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl @@ -437,7 +437,7 @@ </section> !Finclude/net/mac80211.h ieee80211_get_buffered_bc !Finclude/net/mac80211.h ieee80211_beacon_get -!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe +!Finclude/net/mac80211.h ieee80211_sta_eosp !Finclude/net/mac80211.h ieee80211_frame_release_type !Finclude/net/mac80211.h ieee80211_sta_ps_transition !Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni |
