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