---

yaml --- r: 355106 b: refs/heads/master c: 51f29d4 h: refs/heads/master v: v3
git-mirror · Jan 30, 2013 · f35766e · f35766e
1 parent 98f509f
commit f35766e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f7246b272e5c2f1ce27733c371b1206286640bc
+refs/heads/master: 51f29d44414521cc4244958f2a384bcd39d23a6e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1262,6 +1262,14 @@ S:	Maintained
 F:	arch/arm/mach-pxa/z2.c
 F:	arch/arm/mach-pxa/include/mach/z2.h
 
+ARM/ZYNQ ARCHITECTURE
+M:	Michal Simek <michal.simek@xilinx.com>
+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+W:	http://wiki.xilinx.com
+T:	git git://git.xilinx.com/linux-xlnx.git
+S:	Supported
+F:	arch/arm/mach-zynq/
+
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:	Catalin Marinas <catalin.marinas@arm.com>
 M:	Will Deacon <will.deacon@arm.com>