diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
| commit | 094daf7db7c47861009899ce23f9177d761e20b0 (patch) | |
| tree | a107065393720b80664157a035b206576e834793 /Documentation/feature-removal-schedule.txt | |
| parent | ll_temac: convert to SKB paged frag API. (diff) | |
| parent | ath6kl: fixup merge damage in ath6kl_mgmt_tx (diff) | |
| download | linux-dev-094daf7db7c47861009899ce23f9177d761e20b0.tar.xz linux-dev-094daf7db7c47861009899ce23f9177d761e20b0.zip | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
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 4dc465477665..d5ac362daef5 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -594,9 +594,18 @@ Why: In 3.0, we can now autodetect internal 3G device and already have Who: Lee, Chun-Yi <jlee@novell.com> ---------------------------- + What: The XFS nodelaylog mount option When: 3.3 Why: The delaylog mode that has been the default since 2.6.39 has proven stable, and the old code is in the way of additional improvements in the log code. Who: Christoph Hellwig <hch@lst.de> + +---------------------------- + +What: iwlagn alias support +When: 3.5 +Why: The iwlagn module has been renamed iwlwifi. The alias will be around + for backward compatibility for several cycles and then dropped. +Who: Don Fry <donald.h.fry@intel.com> |