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

[~andy/linux] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 33f7327d0451bec279299124758786116fd36b2c..5575759b84eedccead799d851499ec69c5da3d8d 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -85,17 +85,6 @@ Who: Robin Getz <rgetz@blackfin.uclinux.org> & Matt Mackall <mpm@selenic.com>
 
 ---------------------------
 
-What:  Deprecated snapshot ioctls
-When:  2.6.36
-
-Why:   The ioctls in kernel/power/user.c were marked as deprecated long time
-       ago. Now they notify users about that so that they need to replace
-       their userspace. After some more time, remove them completely.
-
-Who:   Jiri Slaby <jirislaby@gmail.com>
-
----------------------------
-
 What:  The ieee80211_regdom module parameter
 When:  March 2010 / desktop catchup
 
@@ -361,15 +350,6 @@ Who:       anybody or Florian Mickler <florian@mickler.org>
 
 ----------------------------
 
-What:  KVM paravirt mmu host support
-When:  January 2011
-Why:   The paravirt mmu host support is slower than non-paravirt mmu, both
-       on newer and older hardware.  It is already not exposed to the guest,
-       and kept only for live migration purposes.
-Who:   Avi Kivity <avi@redhat.com>
-
-----------------------------
-
 What:  iwlwifi 50XX module parameters
 When:  3.0
 Why:   The "..50" modules parameters were used to configure 5000 series and
@@ -534,6 +514,20 @@ Why:    In 3.0, we can now autodetect internal 3G device and already have
        information log when acer-wmi initial.
 Who:    Lee, Chun-Yi <jlee@novell.com>
 
+---------------------------
+
+What:  /sys/devices/platform/_UDC_/udc/_UDC_/is_dualspeed file and
+       is_dualspeed line in /sys/devices/platform/ci13xxx_*/udc/device file.
+When:  3.8
+Why:   The is_dualspeed file is superseded by maximum_speed in the same
+       directory and is_dualspeed line in device file is superseded by
+       max_speed line in the same file.
+
+       The maximum_speed/max_speed specifies maximum speed supported by UDC.
+       To check if dualspeeed is supported, check if the value is >= 3.
+       Various possible speeds are defined in <linux/usb/ch9.h>.
+Who:   Michal Nazarewicz <mina86@mina86.com>
+
 ----------------------------
 
 What:  The XFS nodelaylog mount option