Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d59e71d..c8616f7 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -199,7 +199,7 @@ Files:      drivers/staging/cs5535_gpio/*
 Check: drivers/staging/cs5535_gpio/cs5535_gpio.c
 Why:   A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and
        integrates with the Linux GPIO subsystem.  The old driver has been
-       moved to staging, and will be removed altogether around 2.6.40.
+       moved to staging, and will be removed altogether around 3.0.
        Please test the new driver, and ensure that the functionality you
        need and any bugfixes from the old driver are available in the new
        one.
@@ -294,7 +294,7 @@ When:       The schedule was July 2008, but it was decided that we are going to keep t
 Why:   The support code for the old firmware hurts code readability/maintainability
        and slightly hurts runtime performance. Bugfixes for the old firmware
        are not provided by Broadcom anymore.
-Who:   Michael Buesch <mb@bu3sch.de>
+Who:   Michael Buesch <m@bues.ch>
 
 ---------------------------
 
@@ -430,7 +430,7 @@ Who:        Avi Kivity <avi@redhat.com>
 ----------------------------
 
 What:  iwlwifi 50XX module parameters
-When:  2.6.40
+When:  3.0
 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
@@ -441,7 +441,7 @@ Who:        Wey-Yi Guy <wey-yi.w.guy@intel.com>
 ----------------------------
 
 What:  iwl4965 alias support
-When:  2.6.40
+When:  3.0
 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.
@@ -482,7 +482,7 @@ Who:        FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 ----------------------------
 
 What:  iwlwifi disable_hw_scan module parameters
-When:  2.6.40
+When:  3.0
 Why:   Hareware scan is the prefer method for iwlwifi devices for
        scanning operation. Remove software scan support for all the
        iwlwifi devices.
@@ -493,7 +493,7 @@ Who:        Wey-Yi Guy <wey-yi.w.guy@intel.com>
 
 What:   access to nfsd auth cache through sys_nfsservctl or '.' files
         in the 'nfsd' filesystem.
-When:   2.6.40
+When:   3.0
 Why:    This is a legacy interface which have been replaced by a more
         dynamic cache.  Continuing to maintain this interface is an
         unnecessary burden.
@@ -519,7 +519,7 @@ Files:      net/netfilter/xt_connlimit.c
 ----------------------------
 
 What:  noswapaccount kernel command line parameter
-When:  2.6.40
+When:  3.0
 Why:   The original implementation of memsw feature enabled by
        CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
        kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
@@ -552,7 +552,7 @@ Who:        Jean Delvare <khali@linux-fr.org>
 ----------------------------
 
 What:  Support for UVCIOC_CTRL_ADD in the uvcvideo driver
-When:  2.6.42
+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>
@@ -560,7 +560,7 @@ Who:        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 ----------------------------
 
 What:  Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver
-When:  2.6.42
+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>
@@ -568,7 +568,7 @@ Who:        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 ----------------------------
 
 What:  Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver
-When:  2.6.42
+When:  3.2
 Why:   Superseded by the UVCIOC_CTRL_QUERY ioctl.
 Who:   Laurent Pinchart <laurent.pinchart@ideasonboard.com>