Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-beck.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2cbbac8019c8fd86cdef41b145dfa25fcc8590fe..e824c1e742023ee021fa0843ff93d7990eaaf8a3 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -353,14 +353,6 @@ Why:       Internal alias support has been present in module-init-tools for some
 
 Who:   Wey-Yi Guy <wey-yi.w.guy@intel.com>
 
----------------------------
-
-What:  xt_NOTRACK
-Files: net/netfilter/xt_NOTRACK.c
-When:  April 2011
-Why:   Superseded by xt_CT
-Who:   Netfilter developer team <netfilter-devel@vger.kernel.org>
-
 ----------------------------
 
 What:  IRQF_DISABLED
@@ -567,7 +559,7 @@ Why:        KVM tracepoints provide mostly equivalent information in a much more
 ----------------------------
 
 What:  at91-mci driver ("CONFIG_MMC_AT91")
-When:  3.7
+When:  3.8
 Why:   There are two mci drivers: at91-mci and atmel-mci. The PDC support
        was added to atmel-mci as a first step to support more chips.
        Then at91-mci was kept only for old IP versions (on at91rm9200 and