Merge branch 'omap/cleanup-prcm-part2' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:59:54 +0000 (17:59 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:59:54 +0000 (17:59 +0100)
commitcff9f37a1e7b2565f254b5ab40c3213cc0f823a1
tree4ce5bef1e68a7cdd0567a6ab7c755fdbd9365d7b
parentb599dc078a7fd423c97217756d09400403a90a7f
parentcc4b1e24b93dd529b1d49258bee044d319b5b129
Merge branch 'omap/cleanup-prcm-part2' into next/dt

This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.

Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
22 files changed:
arch/arm/mach-omap1/common.h
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/clkt2xxx_dpllcore.c
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/i2c.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap4-common.c
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/prm33xx.c
arch/arm/mach-omap2/prm_common.c
arch/arm/mach-omap2/sdrc.c
arch/arm/mach-omap2/sdrc2xxx.c
arch/arm/mach-omap2/sleep34xx.S