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

[safe/jmp/linux-2.6] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index e7965f4..a86152a 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -241,16 +241,6 @@ Who:       Thomas Gleixner <tglx@linutronix.de>
 
 ---------------------------
 
-What (Why):
-       - xt_recent: the old ipt_recent proc dir
-         (superseded by /proc/net/xt_recent)
-
-When:  January 2009 or Linux 2.7.0, whichever comes first
-Why:   Superseded by newer revisions or modules
-Who:   Jan Engelhardt <jengelh@computergmbh.de>
-
----------------------------
-
 What:  GPIO autorequest on gpio_direction_{input,output}() in gpiolib
 When:  February 2010
 Why:   All callers should use explicit gpio_request()/gpio_free().
@@ -520,6 +510,24 @@ Who:       Hans de Goede <hdegoede@redhat.com>
 
 ----------------------------
 
+What:  sysfs-class-rfkill state file
+When:  Feb 2014
+Files: net/rfkill/core.c
+Why:   Documented as obsolete since Feb 2010. This file is limited to 3
+       states while the rfkill drivers can have 4 states.
+Who:   anybody or Florian Mickler <florian@mickler.org>
+
+----------------------------
+
+What:  sysfs-class-rfkill claim file
+When:  Feb 2012
+Files: net/rfkill/core.c
+Why:   It is not possible to claim an rfkill driver since 2007. This is
+       Documented as obsolete since Feb 2010.
+Who:   anybody or Florian Mickler <florian@mickler.org>
+
+----------------------------
+
 What:  capifs
 When:  February 2011
 Files: drivers/isdn/capi/capifs.*
@@ -579,6 +587,35 @@ Who:       Len Brown <len.brown@intel.com>
 
 ----------------------------
 
+What:  iwlwifi 50XX module parameters
+When:  2.6.40
+Why:   The "..50" modules parameters were used to configure 5000 series and
+       up devices; different set of module parameters also available for 4965
+       with same functionalities. Consolidate both set into single place
+       in drivers/net/wireless/iwlwifi/iwl-agn.c
+
+Who:   Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+----------------------------
+
+What:  iwl4965 alias support
+When:  2.6.40
+Why:   Internal alias support has been present in module-init-tools for some
+       time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
+       with no impact.
+
+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:  video4linux /dev/vtx teletext API support
 When:  2.6.35
 Files: drivers/media/video/saa5246a.c drivers/media/video/saa5249.c