Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

[sfrench/cifs-2.6.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 309c47b91598e4fba5d23eaec16234d560624895..b45ea28abc997c5269f20fdaa331f9a558cb4705 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -298,3 +298,11 @@ Why:       /sys/fs/o2cb is the proper location for this information - /sys/o2cb
        ocfs2-tools. 2 years should be sufficient time to phase in new versions
        which know to look in /sys/fs/o2cb.
 Who:   ocfs2-devel@oss.oracle.com
+
+---------------------------
+
+What:  asm/semaphore.h
+When:  2.6.26
+Why:   Implementation became generic; users should now include
+       linux/semaphore.h instead.
+Who:   Matthew Wilcox <willy@linux.intel.com>