diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
| commit | 95a943c162d74b20d869917bdf5df11293c35b63 (patch) | |
| tree | c69d5cb97a4d97b6062a276ecdfa8582535193af /Documentation | |
| parent | ecae42d37045ec71831d0e0e493e00b0e0732edd (diff) | |
| parent | 95acac61ba66c4abd40e038dae8c1ed2e176c7b1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl index 8906648f962b..445289cd0e65 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl | |||
| @@ -402,8 +402,9 @@ | |||
| 402 | !Finclude/net/mac80211.h set_key_cmd | 402 | !Finclude/net/mac80211.h set_key_cmd |
| 403 | !Finclude/net/mac80211.h ieee80211_key_conf | 403 | !Finclude/net/mac80211.h ieee80211_key_conf |
| 404 | !Finclude/net/mac80211.h ieee80211_key_flags | 404 | !Finclude/net/mac80211.h ieee80211_key_flags |
| 405 | !Finclude/net/mac80211.h ieee80211_tkip_key_type | 405 | !Finclude/net/mac80211.h ieee80211_get_tkip_p1k |
| 406 | !Finclude/net/mac80211.h ieee80211_get_tkip_key | 406 | !Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv |
| 407 | !Finclude/net/mac80211.h ieee80211_get_tkip_p2k | ||
| 407 | !Finclude/net/mac80211.h ieee80211_key_removed | 408 | !Finclude/net/mac80211.h ieee80211_key_removed |
| 408 | </chapter> | 409 | </chapter> |
| 409 | 410 | ||