diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:21:04 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:23:00 +0000 |
commit | 928a11ba36f999436915ea2b1eadf54301f93059 (patch) | |
tree | 8d7cb575d528ddd4b1165e4690401c729c1eb930 | |
parent | 237c78beb8a988453bac1993d21f025d070a0d8d (diff) | |
parent | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (diff) |
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>
135 files changed, 1640 insertions, 1483 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 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 444822526a07..ff7416f8eb83 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -658,6 +658,7 @@ config ARCH_PICOXCELL |