Merge branch 'dt/gic' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:08:10 +0000 (14:08 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:08:10 +0000 (14:08 +0100)
commit08cab72f91c8b28ffabfd143119bccdd4a115ad7
treeccd5583971caecd82bf2d1e62691bf6e0362d650
parent86c1e5a74af11e4817ffa6d7748d9ac1353b5b53
parentf37a53cc5d8a8fb199e41386d125d8c2ed9e54ef
Merge branch 'dt/gic' into next/dt

Conflicts:
arch/arm/include/asm/localtimer.h
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-omap2/board-generic.c
35 files changed:
arch/arm/include/asm/localtimer.h
arch/arm/kernel/perf_event_v7.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mx5/board-mx51_babbage.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-am3517crane.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-omap2/board-zoom.c
arch/arm/mach-omap2/io.c
arch/arm/mm/init.c
arch/arm/plat-omap/include/plat/io.h