diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 10:39:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 10:39:27 -0400 |
| commit | d3641409a05dcb8e28116bb2ad638f5a42805d9d (patch) | |
| tree | 1d43a5e0129709502edb631a4fd66de369ee5620 /Documentation | |
| parent | 953c96e0d85615d1ab1f100e525d376053294dc2 (diff) | |
| parent | 6fe5468f452c0c40348ebd4e737758a842286ca8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/sta_info.c
net/wireless/core.h
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 284ced7a228f..0f6a3edcd44b 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl | |||
| @@ -437,7 +437,7 @@ | |||
| 437 | </section> | 437 | </section> |
| 438 | !Finclude/net/mac80211.h ieee80211_get_buffered_bc | 438 | !Finclude/net/mac80211.h ieee80211_get_buffered_bc |
| 439 | !Finclude/net/mac80211.h ieee80211_beacon_get | 439 | !Finclude/net/mac80211.h ieee80211_beacon_get |
| 440 | !Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe | 440 | !Finclude/net/mac80211.h ieee80211_sta_eosp |
| 441 | !Finclude/net/mac80211.h ieee80211_frame_release_type | 441 | !Finclude/net/mac80211.h ieee80211_frame_release_type |
| 442 | !Finclude/net/mac80211.h ieee80211_sta_ps_transition | 442 | !Finclude/net/mac80211.h ieee80211_sta_ps_transition |
| 443 | !Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni | 443 | !Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni |