diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 15:53:02 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 15:53:04 +1100 |
commit | 6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (patch) | |
tree | e36b518353cf1b36c20a8b315de17ea8ee577c39 /MAINTAINERS | |
parent | 200445685b48a1f4eb8e4abb4ae46f22236b1197 (diff) | |
parent | 1224d22e9f1c57618e6db3737c17f8a1e0927d18 (diff) |
Merge branch 'akpm-current/current'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fa08166d617f..3723e50e2ca2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3967,10 +3967,13 @@ S: Maintained F: drivers/i2c/busses/i2c-diolan-u2c.c DIRECT ACCESS (DAX) -M: Matthew Wilcox <willy@linux.intel.com> +M: Matthew Wilcox <mawilcox@microsoft.com> +M: Ross Zwisler <ross.zwisler@linux.intel.com> L: linux-fsdevel@vger.kernel.org S: Supported F: fs/dax.c +F: include/linux/dax.h +F: include/trace/events/fs_dax.h DIRECTORY NOTIFICATION (DNOTIFY) M: Eric Paris <eparis@parisplace.org> @@ -7281,6 +7284,7 @@ M: Masami Hiramatsu <mhiramat@kernel.org> S: Maintained F: Documentation/kprobes.txt F: include/linux/kprobes.h +F: include/asm-generic/kprobes.h F: kernel/kprobes.c KS0108 LCD CONTROLLER DRIVER |