diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:34:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:34:36 -0800 |
| commit | a7c243b544c0e9f6775c2607decaa59d54fb9e11 (patch) | |
| tree | 86fdb4d2d6cef932af7497f28827e7d52b29e48c /include/net/ieee80211.h | |
| parent | 7df446e7e043b2ba5fd5de42529f9d797e8b501a (diff) | |
| parent | f406db8cba6bbce42b96490e6d31bdec229ad994 (diff) | |
| download | talos-op-linux-a7c243b544c0e9f6775c2607decaa59d54fb9e11.tar.gz talos-op-linux-a7c243b544c0e9f6775c2607decaa59d54fb9e11.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/net/ieee80211.h')
| -rw-r--r-- | include/net/ieee80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 5e38dca1d082..b93fd8c1d884 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -29,7 +29,7 @@ #include <linux/kernel.h> /* ARRAY_SIZE */ #include <linux/wireless.h> -#define IEEE80211_VERSION "git-1.1.6" +#define IEEE80211_VERSION "git-1.1.7" #define IEEE80211_DATA_LEN 2304 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section |
