diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-08 15:39:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-08 15:39:28 -0400 |
| commit | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (patch) | |
| tree | d9f76964c77c1059483b08436ed060b702b8e25d /Documentation/feature-removal-schedule.txt | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 15a6321d1c0f8db561932cd99e1b9897981da71f (diff) | |
| download | linux-e9a68707d736f4f73d7e209885d7b4c5c452b1dc.tar.gz linux-e9a68707d736f4f73d7e209885d7b4c5c452b1dc.tar.bz2 linux-e9a68707d736f4f73d7e209885d7b4c5c452b1dc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ipw2x00/ipw2200.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 842aa9de84a6..f45638962858 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -564,3 +564,12 @@ Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> ---------------------------- +What: iwlwifi disable_hw_scan module parameters +When: 2.6.40 +Why: Hareware scan is the prefer method for iwlwifi devices for + scanning operation. Remove software scan support for all the + iwlwifi devices. + +Who: Wey-Yi Guy <wey-yi.w.guy@intel.com> + +---------------------------- |