Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[cascardo/linux.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f613df8..a004b04 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -317,18 +317,6 @@ Who:       ocfs2-devel@oss.oracle.com
 
 ---------------------------
 
-What:  SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,
-       SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD
-When:  June 2009
-Why:    A newer version of the options have been introduced in 2005 that
-       removes the limitions of the old API.  The sctp library has been
-        converted to use these new options at the same time.  Any user
-       space app that directly uses the old options should convert to using
-       the new options.
-Who:   Vlad Yasevich <vladislav.yasevich@hp.com>
-
----------------------------
-
 What:  Ability for non root users to shm_get hugetlb pages based on mlock
        resource limits
 When:  2.6.31