Merge ../linux-2.6

1 files changed, 12 insertions, 2 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 293fed113dff..43ab119963d5 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -25,8 +25,9 @@ Who:	Adrian Bunk <bunk@stusta.de>
 
 ---------------------------
 
-What:   drivers depending on OBSOLETE_OSS_DRIVER
-When:   January 2006
+What:   drivers that were depending on OBSOLETE_OSS_DRIVER
+        (config options already removed)
+When:   before 2.6.19
 Why:    OSS drivers with ALSA replacements
 Who:    Adrian Bunk <bunk@stusta.de>
 
@@ -56,6 +57,15 @@ Who:	Jody McIntyre <scjody@steamballoon.com>
 
 ---------------------------
 
+What:   sbp2: module parameter "force_inquiry_hack"
+When:   July 2006
+Why:    Superceded by parameter "workarounds". Both parameters are meant to be
+        used ad-hoc and for single devices only, i.e. not in modprobe.conf,
+        therefore the impact of this feature replacement should be low.
+Who:    Stefan Richter <stefanr@s5r6.in-berlin.de>
+
+---------------------------
+
 What:   Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:   July 2006
 Why:    V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6