diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 10:48:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 10:48:58 -0400 |
| commit | 573efdc5ea953fdbedb9cfe2d2c2f5d23d60ca8f (patch) | |
| tree | 0ca1bc68f152bd9ffe1f5803a7b01200b1a8c5de | |
| parent | f78b5be2a5d08709177963df17b8df42e690a652 (diff) | |
| parent | 93a64ee71d10abc5787de7d4a00027e2c6469c3b (diff) | |
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
| -rw-r--r-- | MAINTAINERS | 1 |
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 | |||
| 6408 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core | 6408 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core |
| 6409 | S: Maintained | 6409 | S: Maintained |
| 6410 | F: kernel/futex.c | 6410 | F: kernel/futex.c |
| 6411 | F: kernel/futex_compat.c | ||
| 6412 | F: include/asm-generic/futex.h | 6411 | F: include/asm-generic/futex.h |
| 6413 | F: include/linux/futex.h | 6412 | F: include/linux/futex.h |
| 6414 | F: include/uapi/linux/futex.h | 6413 | F: include/uapi/linux/futex.h |