diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-10-17 22:23:33 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-17 22:23:33 +0200 |
commit | 290eddc4b3661dc4dfa95d199e0be5788928b3b1 (patch) | |
tree | 2130a4aab73e43e08b6566b06211069a96a2ff22 /include/net/ipip.h | |
parent | iwlwifi: fix 6000 series channel switch command (diff) | |
parent | mac80211: connect with HT20 if HT40 is not permitted (diff) | |
download | linux-290eddc4b3661dc4dfa95d199e0be5788928b3b1.tar.xz linux-290eddc4b3661dc4dfa95d199e0be5788928b3b1.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'include/net/ipip.h')
0 files changed, 0 insertions, 0 deletions