diff options
author | Linus Torvalds | 2020-02-25 10:09:41 -0800 |
---|---|---|
committer | Linus Torvalds | 2020-02-25 10:09:41 -0800 |
commit | d67f250e96344f006e3a6be148def4c6537d05a0 (patch) | |
tree | ba8c9b5fe2c68deee525d3cc2eb9f39ca20dfcf4 /MAINTAINERS | |
parent | 63623fd44972d1ed2bfb6e0fb631dfcf547fd1e7 (diff) | |
parent | 3234f4ed3066a58cd5ce8edcf752fa4fe0c95cb5 (diff) |
Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Paul Burton:
"Here are a few MIPS fixes, and a MAINTAINERS update to hand over MIPS
maintenance to Thomas Bogendoerfer - this will be my final pull
request as MIPS maintainer.
Thanks for your helpful comments, useful corrections & responsiveness
during the time I've fulfilled the role, and I'm sure I'll pop up
elsewhere in the tree somewhere down the line"
* 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MAINTAINERS: Hand MIPS over to Thomas
MIPS: ingenic: DTS: Fix watchdog nodes
MIPS: X1000: Fix clock of watchdog node.
MIPS: vdso: Wrap -mexplicit-relocs in cc-option
MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()'
MIPS: cavium_octeon: Fix syncw generation.
mips: vdso: add build time check that no 'jalr t9' calls left
MIPS: Disable VDSO time functionality on microMIPS
mips: vdso: fix 'jalr t9' crash in vdso code
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fcd79fc38928..8f27f40d22bb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11115,14 +11115,12 @@ S: Maintained F: drivers/usb/image/microtek.* MIPS -M: Ralf Baechle <ralf@linux-mips.org> -M: Paul Burton <paulburton@kernel.org> +M: Thomas Bogendoerfer <tsbogend@alpha.franken.de> L: linux-mips@vger.kernel.org W: http://www.linux-mips.org/ -T: git git://git.linux-mips.org/pub/scm/ralf/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git Q: http://patchwork.linux-mips.org/project/linux-mips/list/ -S: Supported +S: Maintained F: Documentation/devicetree/bindings/mips/ F: Documentation/mips/ F: arch/mips/ |