Merge branch 'late/clksrc' into late/cleanup
authorArnd Bergmann <arnd@arndb.de>
Mon, 6 May 2013 21:43:45 +0000 (23:43 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 6 May 2013 21:43:45 +0000 (23:43 +0200)
commit442a33ebce9e02a2dd6662f16c9f2aad834d0115
treeca8654a286f61da917318645cab9e061095ecdba
parenta94d236dc355f374857ee4e6e78b7dec8a0f29e3
parentf31c2f1c68aff83277eddc6798adf3438e9c680a
Merge branch 'late/clksrc' into late/cleanup

There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.

Conflicts:
arch/arm/mach-spear/spear13xx.c
drivers/irqchip/Makefile
23 files changed:
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-spear/spear13xx.c
drivers/clk/spear/spear1340_clock.c
drivers/clk/tegra/clk-tegra20.c
drivers/irqchip/Makefile