diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /Documentation/feature-removal-schedule.txt | |
| parent | 93c8b90f01f0dc73891da4e84b26524b61d29d66 (diff) | |
| parent | 0523820482dcb42784572ffd2296c2f08c275a2b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index c93fcdec246d..d0f22fac55da 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -340,3 +340,11 @@ Why: Accounting can now be enabled/disabled without kernel recompilation. | |||
| 340 | controlled by a kernel/module/sysfs/sysctl parameter. | 340 | controlled by a kernel/module/sysfs/sysctl parameter. |
| 341 | Who: Krzysztof Piotr Oledzki <ole@ans.pl> | 341 | Who: Krzysztof Piotr Oledzki <ole@ans.pl> |
| 342 | 342 | ||
| 343 | --------------------------- | ||
| 344 | |||
| 345 | What: ide-scsi (BLK_DEV_IDESCSI) | ||
| 346 | When: 2.6.29 | ||
| 347 | Why: The 2.6 kernel supports direct writing to ide CD drives, which | ||
| 348 | eliminates the need for ide-scsi. The new method is more | ||
| 349 | efficient in every way. | ||
| 350 | Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | ||