diff options
author | Patrick McHardy <kaber@trash.net> | 2010-06-15 17:31:06 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-06-15 17:31:06 +0200 |
commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /include/linux/nl80211.h | |
parent | netfilter: xtables: idletimer target implementation (diff) | |
parent | bnx2x: Fix link problem with some DACs (diff) | |
download | linux-dev-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.tar.xz linux-dev-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.zip |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/nl80211.h')
-rw-r--r-- | include/linux/nl80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index b7c77f9712f4..64fb32b93a28 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h @@ -132,7 +132,7 @@ * %NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and * %NL80211_ATTR_REG_RULE_POWER_MAX_EIRP. * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain - * to the the specified ISO/IEC 3166-1 alpha2 country code. The core will + * to the specified ISO/IEC 3166-1 alpha2 country code. The core will * store this as a valid request and then query userspace for it. * * @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the |