diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 18:04:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 18:04:08 +1100 |
| commit | 7b9642b14b6ee67c52df08bb4d83c814c5382ab1 (patch) | |
| tree | afdc4f834210b7043597b2ab246c4d03886baf2e /net | |
| parent | 1a9f34a47333c3d16b1c93e98b5978a526ce5fa8 (diff) | |
| parent | 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 (diff) | |
Merge commit 'trivial/next'
Conflicts:
Documentation/edac.txt
include/linux/securebits.h
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/wext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/wext.c b/net/wireless/wext.c index d98ffb75119a..e49a2d1ef1e4 100644 --- a/net/wireless/wext.c +++ b/net/wireless/wext.c @@ -64,7 +64,7 @@ * o Remove spy_offset from struct iw_handler_def * o Start deprecating dev->get_wireless_stats, output a warning * o If IW_QUAL_DBM is set, show dBm values in /proc/net/wireless - * o Don't loose INVALID/DBM flags when clearing UPDATED flags (iwstats) + * o Don't lose INVALID/DBM flags when clearing UPDATED flags (iwstats) * * v8 - 17.02.06 - Jean II * o RtNetlink requests support (SET/GET) |