diff options
author | 2012-05-02 11:48:07 -0700 | |
---|---|---|
committer | 2012-05-02 11:48:07 -0700 | |
commit | d210267741fb2a8b6d741d9040703683a39087f4 (patch) | |
tree | bfc1cdf7925644367cec4c82f2a5fb6d4c51a8eb /drivers/staging/rtl8187se/ieee80211/dot11d.c | |
parent | Linux 3.4-rc5 (diff) | |
parent | Staging: comedi: fix line over 80 character issue in rtd520.c (diff) | |
download | linux-dev-d210267741fb2a8b6d741d9040703683a39087f4.tar.xz linux-dev-d210267741fb2a8b6d741d9040703683a39087f4.zip |
Merge 3.4-rc5 into staging-next
This resolves the conflict in:
drivers/staging/vt6656/ioctl.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8187se/ieee80211/dot11d.c')
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/dot11d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/dot11d.c b/drivers/staging/rtl8187se/ieee80211/dot11d.c index 309bb8bf287e..0e93eb0735a7 100644 --- a/drivers/staging/rtl8187se/ieee80211/dot11d.c +++ b/drivers/staging/rtl8187se/ieee80211/dot11d.c @@ -55,7 +55,7 @@ Dot11d_Reset(struct ieee80211_device *ieee) // // Description: -// Update country IE from Beacon or Probe Resopnse +// Update country IE from Beacon or Probe Response // and configure PHY for operation in the regulatory domain. // // TODO: |