diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-11 14:48:32 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-11 14:48:32 -0400 |
| commit | 3899ba90a4ab2f3cab8e0f91a76c14ff131c8293 (patch) | |
| tree | ae82b469f8a7ceb42547d11dd1fe5c73abc8635b /Documentation | |
| parent | 45203a3b380cee28f570475c0d28c169f908c209 (diff) | |
| parent | 8b3e7be437a6b62118d0485ad971e724afe23fdf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/debug.c
net/mac80211/iface.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl index 0f6a3edcd44b..ebe89694cf81 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl | |||
| @@ -132,9 +132,7 @@ | |||
| 132 | !Finclude/net/cfg80211.h cfg80211_send_rx_assoc | 132 | !Finclude/net/cfg80211.h cfg80211_send_rx_assoc |
| 133 | !Finclude/net/cfg80211.h cfg80211_send_assoc_timeout | 133 | !Finclude/net/cfg80211.h cfg80211_send_assoc_timeout |
| 134 | !Finclude/net/cfg80211.h cfg80211_send_deauth | 134 | !Finclude/net/cfg80211.h cfg80211_send_deauth |
| 135 | !Finclude/net/cfg80211.h __cfg80211_send_deauth | ||
| 136 | !Finclude/net/cfg80211.h cfg80211_send_disassoc | 135 | !Finclude/net/cfg80211.h cfg80211_send_disassoc |
| 137 | !Finclude/net/cfg80211.h __cfg80211_send_disassoc | ||
| 138 | !Finclude/net/cfg80211.h cfg80211_ibss_joined | 136 | !Finclude/net/cfg80211.h cfg80211_ibss_joined |
| 139 | !Finclude/net/cfg80211.h cfg80211_connect_result | 137 | !Finclude/net/cfg80211.h cfg80211_connect_result |
| 140 | !Finclude/net/cfg80211.h cfg80211_roamed | 138 | !Finclude/net/cfg80211.h cfg80211_roamed |