summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--CREDITS5
-rw-r--r--MAINTAINERS14
2 files changed, 5 insertions, 14 deletions
diff --git a/CREDITS b/CREDITS
index a3ec0c744172..989cda91c427 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1564,6 +1564,11 @@ W: http://www.carumba.com/
1564D: bug toaster (A1 sauce makes all the difference) 1564D: bug toaster (A1 sauce makes all the difference)
1565D: Random linux hacker 1565D: Random linux hacker
1566 1566
1567N: James Hogan
1568E: jhogan@kernel.org
1569D: Metag architecture maintainer
1570D: TZ1090 SoC maintainer
1571
1567N: Tim Hockin 1572N: Tim Hockin
1568E: thockin@hockin.org 1573E: thockin@hockin.org
1569W: http://www.hockin.org/~thockin 1574W: 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
9081F: Documentation/devicetree/bindings/media/meson-ao-cec.txt 9081F: Documentation/devicetree/bindings/media/meson-ao-cec.txt
9082T: git git://linuxtv.org/media_tree.git 9082T: git git://linuxtv.org/media_tree.git
9083 9083
9084METAG ARCHITECTURE
9085M: James Hogan <jhogan@kernel.org>
9086L: linux-metag@vger.kernel.org
9087T: git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
9088S: Odd Fixes
9089F: arch/metag/
9090F: Documentation/metag/
9091F: Documentation/devicetree/bindings/metag/
9092F: Documentation/devicetree/bindings/interrupt-controller/img,*
9093F: drivers/clocksource/metag_generic.c
9094F: drivers/irqchip/irq-metag.c
9095F: drivers/irqchip/irq-metag-ext.c
9096F: drivers/tty/metag_da.c
9097
9098MICROBLAZE ARCHITECTURE 9084MICROBLAZE ARCHITECTURE
9099M: Michal Simek <monstr@monstr.eu> 9085M: Michal Simek <monstr@monstr.eu>
9100W: http://www.monstr.eu/fdt/ 9086W: http://www.monstr.eu/fdt/