Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7907586..5e02b83 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -64,10 +64,10 @@ Who:        Pavel Machek <pavel@suse.cz>
 
 ---------------------------
 
-What:  Video4Linux API 1 ioctls and video_decoder.h from Video devices.
-When:  December 2008
-Files: include/linux/video_decoder.h include/linux/videodev.h
-Check: include/linux/video_decoder.h include/linux/videodev.h
+What:  Video4Linux API 1 ioctls and from Video devices.
+When:  July 2009
+Files: include/linux/videodev.h
+Check: include/linux/videodev.h
 Why:   V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6
        series. The old API have lots of drawbacks and don't provide enough
        means to work with all video and audio standards. The newer API is
@@ -356,17 +356,6 @@ Who:       Hans de Goede <hdegoede@redhat.com>
 
 ---------------------------
 
-What:  SELinux "compat_net" functionality
-When:  2.6.30 at the earliest
-Why:   In 2.6.18 the Secmark concept was introduced to replace the "compat_net"
-       network access control functionality of SELinux.  Secmark offers both
-       better performance and greater flexibility than the "compat_net"
-       mechanism.  Now that the major Linux distributions have moved to
-       Secmark, it is time to deprecate the older mechanism and start the
-       process of removing the old code.
-Who:   Paul Moore <paul.moore@hp.com>
----------------------------
-
 What:  sysfs ui for changing p4-clockmod parameters
 When:  September 2009
 Why:   See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and