diff --git a/[refs] b/[refs]
index a39fc365f098..b5dcb84ae4e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48371cd3f4226275c529bb8675a99572db19cc7c
+refs/heads/master: e0ee98513d1a2e24d2ddbdecf4216bcca29d1158
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 88241154f4ce..807aeadf0c4a 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -741,6 +741,14 @@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 M:	Michael Petchkovsky <mkpetch@internode.on.net>
 S:	Maintained
 
+ARM/NOMADIK ARCHITECTURE
+M:     Alessandro Rubini <rubini@unipv.it>
+M:     STEricsson <STEricsson_nomadik_linux@list.st.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-nomadik/
+F:     arch/arm/plat-nomadik/
+
 ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 M:	Nelson Castillo <arhuaco@freaks-unidos.net>
 L:	openmoko-kernel@lists.openmoko.org (subscribers-only)