summaryrefslogtreecommitdiff
path: root/Documentation/feature-removal-schedule.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
-rw-r--r--Documentation/feature-removal-schedule.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index caa5d801c29b..5d5ff565c6f4 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -534,7 +534,6 @@ Who: Kees Cook <keescook@chromium.org>
----------------------------
-<<<<<<< HEAD
What: setitimer accepts user NULL pointer (value)
When: 3.6
Why: setitimer is not returning -EFAULT if user pointer is NULL. This