Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6.git] / MAINTAINERS
index c67a402..5084539 100644 (file)
@@ -594,6 +594,11 @@ M: kernel@wantstofly.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
+ARM/MAGICIAN MACHINE SUPPORT
+P:     Philipp Zabel
+M:     philipp.zabel@gmail.com
+S:     Maintained
+
 ARM/TOSA MACHINE SUPPORT
 P:     Dmitry Baryshkov
 M:     dbaryshkov@gmail.com