Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f425d69..95788ad 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -35,17 +35,6 @@ Who: Luis R. Rodriguez <lrodriguez@atheros.com>
 
 ---------------------------
 
-What:  AR9170USB
-When:  2.6.40
-
-Why:   This driver is deprecated and the firmware is no longer
-       maintained. The replacement driver "carl9170" has been
-       around for a while, so the devices are still supported.
-
-Who:   Christian Lamparter <chunkeey@googlemail.com>
-
----------------------------
-
 What:  IRQF_SAMPLE_RANDOM
 Check: IRQF_SAMPLE_RANDOM
 When:  July 2009
@@ -226,7 +215,7 @@ Who:        Zhang Rui <rui.zhang@intel.com>
 What:  CONFIG_ACPI_PROCFS_POWER
 When:  2.6.39
 Why:   sysfs I/F for ACPI power devices, including AC and Battery,
-        has been working in upstream kenrel since 2.6.24, Sep 2007.
+        has been working in upstream kernel since 2.6.24, Sep 2007.
        In 2.6.37, we make the sysfs I/F always built in and this option
        disabled by default.
        Remove this option and the ACPI power procfs interface in 2.6.39.
@@ -405,16 +394,6 @@ Who:       anybody or Florian Mickler <florian@mickler.org>
 
 ----------------------------
 
-What:  capifs
-When:  February 2011
-Files: drivers/isdn/capi/capifs.*
-Why:   udev fully replaces this special file system that only contains CAPI
-       NCCI TTY device nodes. User space (pppdcapiplugin) works without
-       noticing the difference.
-Who:   Jan Kiszka <jan.kiszka@web.de>
-
-----------------------------
-
 What:  KVM paravirt mmu host support
 When:  January 2011
 Why:   The paravirt mmu host support is slower than non-paravirt mmu, both
@@ -460,14 +439,6 @@ Who:       Thomas Gleixner <tglx@linutronix.de>
 
 ----------------------------
 
-What:  The acpi_sleep=s4_nonvs command line option
-When:  2.6.37
-Files: arch/x86/kernel/acpi/sleep.c
-Why:   superseded by acpi_sleep=nonvs
-Who:   Rafael J. Wysocki <rjw@sisk.pl>
-
-----------------------------
-
 What:  PCI DMA unmap state API
 When:  August 2012
 Why:   PCI DMA unmap state API (include/linux/pci-dma.h) was replaced