diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-05-29 10:00:54 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-05-29 10:00:54 +0200 |
| commit | 723c0b75eb0581d523ae1b7cd49291da9cd846b8 (patch) | |
| tree | 1a30772a1b67ea877114d95f9e8655d1716ec6fc | |
| parent | 266307e19baf80c3726afc0e17ae5181da007c1e (diff) | |
Kill merge marker in Documentation/feature-removal.txtfor-3.5/driversfor-3.5/core
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 1 |
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 |