diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 13:33:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 13:33:37 +0200 |
| commit | a0306db6e5758b0488c79e739de3c0ffe47ea62f (patch) | |
| tree | 86d17769496f96554f89bfc3be02b645a420889f /MAINTAINERS | |
| parent | 4bc07aa4f030d4d3e551ce8d96ca15b6424a5641 (diff) | |
| parent | 3eb2ce825ea1ad89d20f7a3b5780df850e4be274 (diff) | |
| download | linux-stable-a0306db6e5758b0488c79e739de3c0ffe47ea62f.tar.gz linux-stable-a0306db6e5758b0488c79e739de3c0ffe47ea62f.tar.bz2 linux-stable-a0306db6e5758b0488c79e739de3c0ffe47ea62f.zip | |
Merge 4.16-rc7 into staging-next
We want the IIO and staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 61fd41882485..34151f4960c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10348,7 +10348,7 @@ F: drivers/oprofile/ F: include/linux/oprofile.h ORACLE CLUSTER FILESYSTEM 2 (OCFS2) -M: Mark Fasheh <mfasheh@versity.com> +M: Mark Fasheh <mark@fasheh.com> M: Joel Becker <jlbec@evilplan.org> L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers) W: http://ocfs2.wiki.kernel.org @@ -10858,6 +10858,7 @@ F: drivers/platform/x86/peaq-wmi.c PER-CPU MEMORY ALLOCATOR M: Tejun Heo <tj@kernel.org> M: Christoph Lameter <cl@linux.com> +M: Dennis Zhou <dennisszhou@gmail.com> T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git S: Maintained F: include/linux/percpu*.h |