summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-20 11:35:57 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-20 11:35:57 +0100
commit64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch)
tree0b8ed22d46d775f04d441e8c480c12ec297a005b /MAINTAINERS
parent00a8bf859331e349713274825e6fbf20bf2ac15a (diff)
parent402a917aca5daca69fcc91f43e6f1e6939cf393b (diff)
downloadlinux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.gz
linux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.bz2
linux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4c2e406fab61..0ad46148a17a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -692,6 +692,13 @@ M: kernel@wantstofly.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained
+ARM/NUVOTON W90X900 ARM ARCHITECTURE
+P: Wan ZongShun
+M: mcuos.com@gmail.com
+L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W: http://www.mcuos.com
+S: Maintained
+
ARPD SUPPORT
P: Jonathan Layes
L: netdev@vger.kernel.org