Merge branch 'next/cleanup' into samsung/dt

Conflicts:
	arch/arm/mach-exynos/common.c

The common.c file gets changes from rmk/stable-devel (part of
next/cleanup), rmk/restart, samsung/dt and follow-on branches
from the samsung tree.

Pulling it all together here hopefully avoids having to do
even more conflicting merge changesets in this one file. What
a mess!

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 9 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5a70c1809b76..b26219050ff1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5114,6 +5114,15 @@ L:	linux-mtd@lists.infradead.org
 S:      Maintained
 F:      drivers/mtd/devices/phram.c
 
+PICOXCELL SUPPORT
+M:      Jamie Iles <jamie@jamieiles.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://github.com/jamieiles/linux-2.6-ji.git
+S:      Supported
+F:      arch/arm/mach-picoxcell
+F:      drivers/*/picoxcell*
+F:      drivers/*/*/picoxcell*
+
 PIN CONTROL SUBSYSTEM
 M:      Linus Walleij <linus.walleij@linaro.org>
 S:      Maintained