aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-31 07:48:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-31 07:48:58 -0700
commit573efdc5ea953fdbedb9cfe2d2c2f5d23d60ca8f (patch)
tree0ca1bc68f152bd9ffe1f5803a7b01200b1a8c5de /MAINTAINERS
parentf78b5be2a5d08709177963df17b8df42e690a652 (diff)
parent93a64ee71d10abc5787de7d4a00027e2c6469c3b (diff)
downloadlinux-573efdc5ea953fdbedb9cfe2d2c2f5d23d60ca8f.tar.gz
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixlet from Thomas Gleixner: "Trivial update to the maintainers file" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: MAINTAINERS: Remove deleted file from futex file pattern
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bfb15573465f..43b36dbed48e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6408,7 +6408,6 @@ L: linux-kernel@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S: Maintained
F: kernel/futex.c
-F: kernel/futex_compat.c
F: include/asm-generic/futex.h
F: include/linux/futex.h
F: include/uapi/linux/futex.h