aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-12 16:43:01 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-12 16:43:01 -0400
commit7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (patch)
tree110d24e6394dbd98cb33d80a5587cd18c8315e0b /MAINTAINERS
parenta9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 (diff)
parent938870491f0cad030b358af47e28d124b72702d1 (diff)
Merge branch 'pxa-tosa' into pxa
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3b228e2d12e6..20aef9527827 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -584,6 +584,8 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
584S: Maintained 584S: Maintained
585 585
586ARM/TOSA MACHINE SUPPORT 586ARM/TOSA MACHINE SUPPORT
587P: Dmitry Baryshkov
588M: dbaryshkov@gmail.com
587P: Dirk Opfer 589P: Dirk Opfer
588M: dirk@opfer-online.de 590M: dirk@opfer-online.de
589S: Maintained 591S: Maintained