Merge branch 'mxs/cleanup' into next/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 13:57:27 +0000 (15:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:02:14 +0000 (16:02 +0200)
commit71f6424023cb9fa381efc7237ca05926b2b1ca9a
tree6c3c4a2110d0ff3d73c4bacaddb23b9295663695
parent9bc128e16bb82c046d6972171de572affc5c4cbf
parente933a1a12a02f42e0013cda87bba37ccb59efc47
Merge branch 'mxs/cleanup' into next/multiplatform

This is a dependency for mxs/multiplatform

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
arch/arm/Kconfig
arch/arm/Kconfig.debug
drivers/clocksource/Makefile
drivers/irqchip/Makefile