Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6d3dcd4eb649163e7f40ea53c13b9f0f3d694560..56000b33340bbe33f0b141934c756470d32ecbbd 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -589,6 +589,24 @@ Why:       Remount currently allows changing bound subsystems and
 
 ----------------------------
 
+What:  KVM debugfs statistics
+When:  2013
+Why:   KVM tracepoints provide mostly equivalent information in a much more
+        flexible fashion.
+
+----------------------------
+
+What:  at91-mci driver ("CONFIG_MMC_AT91")
+When:  3.7
+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
+       at91sam9261). The support of these IP versions has just been added
+       to atmel-mci, so atmel-mci can be used for all chips.
+Who:   Ludovic Desroches <ludovic.desroches@atmel.com>
+
+----------------------------
+
 What:  net/wanrouter/
 When:  June 2013
 Why:   Unsupported/unmaintained/unused since 2.6