Merge git://github.com/rustyrussell/linux

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 4dc4654..7c799fc 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -495,29 +495,6 @@ Who:       Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
-What:  Support for UVCIOC_CTRL_ADD in the uvcvideo driver
-When:  3.2
-Why:   The information passed to the driver by this ioctl is now queried
-       dynamically from the device.
-Who:   Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
-----------------------------
-
-What:  Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver
-When:  3.2
-Why:   Used only by applications compiled against older driver versions.
-       Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls.
-Who:   Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
-----------------------------
-
-What:  Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver
-When:  3.2
-Why:   Superseded by the UVCIOC_CTRL_QUERY ioctl.
-Who:   Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
-----------------------------
-
 What:  Support for driver specific ioctls in the pwc driver (everything
        defined in media/pwc-ioctl.h)
 When:  3.3
@@ -594,9 +571,18 @@ Why:    In 3.0, we can now autodetect internal 3G device and already have
 Who:    Lee, Chun-Yi <jlee@novell.com>
 
 ----------------------------
+
 What:  The XFS nodelaylog mount option
 When:  3.3
 Why:   The delaylog mode that has been the default since 2.6.39 has proven
        stable, and the old code is in the way of additional improvements in
        the log code.
 Who:   Christoph Hellwig <hch@lst.de>
+
+----------------------------
+
+What:  iwlagn alias support
+When:  3.5
+Why:   The iwlagn module has been renamed iwlwifi.  The alias will be around
+       for backward compatibility for several cycles and then dropped.
+Who:   Don Fry <donald.h.fry@intel.com>