From 6485f78e640d9914cb1d82253259d8a858288933 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Thu, 15 Nov 2012 21:51:26 +0100
Subject: [PATCH] --- yaml --- r: 340034 b: refs/heads/master c:
 1b106699647b56313bac707e12e7ad67180cb147 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 94ff5b11cbdc..1c1fafbde511 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4da2ebb3e75cab12c3243504adee07198aa2677
+refs/heads/master: 1b106699647b56313bac707e12e7ad67180cb147
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 59203e77ce9e..7dbfcb7d4100 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -685,6 +685,12 @@ M:	Lennert Buytenhek <kernel@wantstofly.org>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 
+ARM/Allwinner A1X SoC support
+M:	Maxime Ripard <maxime.ripard@free-electrons.com>
+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:	Maintained
+F:	arch/arm/mach-sunxi/
+
 ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 M:	Andrew Victor <linux@maxim.org.za>
 M:	Nicolas Ferre <nicolas.ferre@atmel.com>