diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-23 13:38:45 +0100 |
---|---|---|
committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-23 13:38:45 +0100 |
commit | 96b6eb8a77dab6ae7eff59c8d2f15e2b92a46552 (patch) | |
tree | 6a82740ce264dbbd5611c9f7891d354499d849f7 /MAINTAINERS | |
parent | 1e07c876ab759954627c13876a5353a06711bf3e (diff) | |
parent | f7d5f5655ef7e5d2a128f6696ac35256e83b119b (diff) |
Merge tag 'mips_fixes_5.6.1' into mips-next
Pull in mips-fixes avoiding conflicts with more CI20 DT changes.
A few MIPS fixes:
- DT fixes for CI20
- Fix command line handling
- Correct patchwork URL
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a0d86490c2c6..53d6ba9f7029 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11114,14 +11114,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 +Q: https://patchwork.kernel.org/project/linux-mips/list/ +S: Maintained F: Documentation/devicetree/bindings/mips/ F: Documentation/mips/ F: arch/mips/ |