Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 61fb823..274b32d 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -35,6 +35,17 @@ 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
@@ -223,14 +234,6 @@ Who:       Zhang Rui <rui.zhang@intel.com>
 
 ---------------------------
 
-What:  /proc/acpi/button
-When:  August 2007
-Why:   /proc/acpi/button has been replaced by events to the input layer
-       since 2.6.20.
-Who:   Len Brown <len.brown@intel.com>
-
----------------------------
-
 What:  /proc/acpi/event
 When:  February 2008
 Why:   /proc/acpi/event has been replaced by events via the input layer
@@ -538,16 +541,6 @@ Who:    NeilBrown <neilb@suse.de>
 
 ----------------------------
 
-What:  i2c_adapter.id
-When:  June 2011
-Why:   This field is deprecated. I2C device drivers shouldn't change their
-       behavior based on the underlying I2C adapter. Instead, the I2C
-       adapter driver should instantiate the I2C devices and provide the
-       needed platform-specific information.
-Who:   Jean Delvare <khali@linux-fr.org>
-
-----------------------------
-
 What:  cancel_rearming_delayed_work[queue]()
 When:  2.6.39
 
@@ -568,6 +561,13 @@ Who:       Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
+What:  xt_connlimit rev 0
+When:  2012
+Who:   Jan Engelhardt <jengelh@medozas.de>
+Files: net/netfilter/xt_connlimit.c
+
+----------------------------
+
 What:  noswapaccount kernel command line parameter
 When:  2.6.40
 Why:   The original implementation of memsw feature enabled by
@@ -583,3 +583,20 @@ Why:       The original implementation of memsw feature enabled by
 Who:   Michal Hocko <mhocko@suse.cz>
 
 ----------------------------
+
+What:  ipt_addrtype match include file
+When:  2012
+Why:   superseded by xt_addrtype
+Who:   Florian Westphal <fw@strlen.de>
+Files: include/linux/netfilter_ipv4/ipt_addrtype.h
+
+----------------------------
+
+What:  i2c_driver.attach_adapter
+       i2c_driver.detach_adapter
+When:  September 2011
+Why:   These legacy callbacks should no longer be used as i2c-core offers
+       a variety of preferable alternative ways to instantiate I2C devices.
+Who:   Jean Delvare <khali@linux-fr.org>
+
+----------------------------