diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:49:02 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:49:02 -0500 |
| commit | 353c78152c10027b8da5de446bad3472f977fcdc (patch) | |
| tree | 8663ca32b912e8b3df428f570b7fd376aa3aa0cb /Documentation | |
| parent | 01925efdf7e03b4b803b5c9f985163d687f7f017 (diff) | |
| parent | d0a361a5b3f5aa28778a0c336de5a911fc0cd678 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
net/wireless/reg.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl index f403ec3c5c9a..46ad6faee9ab 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl | |||
| @@ -152,8 +152,8 @@ | |||
| 152 | !Finclude/net/cfg80211.h cfg80211_scan_request | 152 | !Finclude/net/cfg80211.h cfg80211_scan_request |
| 153 | !Finclude/net/cfg80211.h cfg80211_scan_done | 153 | !Finclude/net/cfg80211.h cfg80211_scan_done |
| 154 | !Finclude/net/cfg80211.h cfg80211_bss | 154 | !Finclude/net/cfg80211.h cfg80211_bss |
| 155 | !Finclude/net/cfg80211.h cfg80211_inform_bss_frame | 155 | !Finclude/net/cfg80211.h cfg80211_inform_bss_width_frame |
| 156 | !Finclude/net/cfg80211.h cfg80211_inform_bss | 156 | !Finclude/net/cfg80211.h cfg80211_inform_bss_width |
| 157 | !Finclude/net/cfg80211.h cfg80211_unlink_bss | 157 | !Finclude/net/cfg80211.h cfg80211_unlink_bss |
| 158 | !Finclude/net/cfg80211.h cfg80211_find_ie | 158 | !Finclude/net/cfg80211.h cfg80211_find_ie |
| 159 | !Finclude/net/cfg80211.h ieee80211_bss_get_ie | 159 | !Finclude/net/cfg80211.h ieee80211_bss_get_ie |