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 | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 15a6321d1c0f8db561932cd99e1b9897981da71f (diff) | |
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')
| -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> | |||
| 564 | 564 | ||
| 565 | ---------------------------- | 565 | ---------------------------- |
| 566 | 566 | ||
| 567 | What: iwlwifi disable_hw_scan module parameters | ||
| 568 | When: 2.6.40 | ||
| 569 | Why: Hareware scan is the prefer method for iwlwifi devices for | ||
| 570 | scanning operation. Remove software scan support for all the | ||
| 571 | iwlwifi devices. | ||
| 572 | |||
| 573 | Who: Wey-Yi Guy <wey-yi.w.guy@intel.com> | ||
| 574 | |||
| 575 | ---------------------------- | ||