summaryrefslogtreecommitdiffstats
path: root/Documentation/feature-removal-schedule.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 08:05:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 08:05:29 -0700
commitb7d41a9fbb364c67d91c3588e117eba547e2d4bf (patch)
treeabf95ce77eaa8b7aed30fded4d3592b4af152a99 /Documentation/feature-removal-schedule.txt
parentda47c19e5c746829042933c8f945a71e2b62d6fc (diff)
parent66fa12c571d35e3cd62574c65f1785a460105397 (diff)
Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: remove the old IEEE 1394 driver stack ieee1394: move init_ohci1394_dma to drivers/firewire/ Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is getting removed, but was modified by the networking merge.
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
-rw-r--r--Documentation/feature-removal-schedule.txt10
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 9961f1564d2..e833c8c81e6 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -502,16 +502,6 @@ Who: Thomas Gleixner <tglx@linutronix.de>
----------------------------
-What: old ieee1394 subsystem (CONFIG_IEEE1394)
-When: 2.6.37
-Files: drivers/ieee1394/ except init_ohci1394_dma.c
-Why: superseded by drivers/firewire/ (CONFIG_FIREWIRE) which offers more
- features, better performance, and better security, all with smaller
- and more modern code base
-Who: Stefan Richter <stefanr@s5r6.in-berlin.de>
-
-----------------------------
-
What: The acpi_sleep=s4_nonvs command line option
When: 2.6.37
Files: arch/x86/kernel/acpi/sleep.c