diff --git a/CREDITS b/CREDITS index a3ec0c744172..989cda91c427 100644 --- a/CREDITS +++ b/CREDITS @@ -1564,6 +1564,11 @@ W: http://www.carumba.com/ D: bug toaster (A1 sauce makes all the difference) D: Random linux hacker +N: James Hogan +E: jhogan@kernel.org +D: Metag architecture maintainer +D: TZ1090 SoC maintainer + N: Tim Hockin E: thockin@hockin.org W: http://www.hockin.org/~thockin diff --git a/MAINTAINERS b/MAINTAINERS index 9a7f76eadae9..d5ddf19e76bb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9081,20 +9081,6 @@ F: drivers/media/platform/meson/ao-cec.c F: Documentation/devicetree/bindings/media/meson-ao-cec.txt T: git git://linuxtv.org/media_tree.git -METAG ARCHITECTURE -M: James Hogan -L: linux-metag@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git -S: Odd Fixes -F: arch/metag/ -F: Documentation/metag/ -F: Documentation/devicetree/bindings/metag/ -F: Documentation/devicetree/bindings/interrupt-controller/img,* -F: drivers/clocksource/metag_generic.c -F: drivers/irqchip/irq-metag.c -F: drivers/irqchip/irq-metag-ext.c -F: drivers/tty/metag_da.c - MICROBLAZE ARCHITECTURE M: Michal Simek W: http://www.monstr.eu/fdt/