Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC cleanups from Arnd Bergmann:
 "This contains cleanups as preparation for other branches adding new
  features, we pulled 16 branches for 9 platforms into this one.

  Most notable here is the removal of support for ATAGS based OMAP4
  systems.  Since all OMAP4 machines are fully functional with DT based
  booting in 3.10, we can remove a lot of code here.

  Also noteworthy is Maxime Ripard's cleanup of the machine descriptors,
  which means we need no machine descriptors in a lot more cases and can
  boot additional machines by just having the respective device drivers
  enabled."

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (76 commits)
  ARM: picoxcell: remove .nr_irqs reference
  ARM: s5p64x0: avoid build warning for uncompress.h
  ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header
  ARM: SAMSUNG: Remove legacy watchdog reset code
  ARM: SAMSUNG: Let platforms use the new watchdog reset driver
  ARM: SAMSUNG: Add watchdog reset driver
  ARM: SAMSUNG: Use local definitions of watchdog registers
  watchdog: s3c2410_wdt: Use local register definitions
  ARM: S5P64X0: Use common uncompress.h part for plat-samsung
  ARM: SAMSUNG: Consolidate uncompress subroutine
  ARM: at91: drop rm9200dk board support
  ARM: dts: msm: Fix merge resolution
  ARM: OMAP1: Remove dma.h
  ARM: OMAP1: Remove legacy irda.h and irda setup from board files
  ARM: OMAP1: Remove duplicated DMA channel definitions
  ARM: OMAP1: Remove McBSP DMA channel definitions
  ARM: OMAP2+: Remove dma.h
  ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions
  ARM: OMAP2+: Remove duplicated DMA channel definitions
  ARM: OMAP2+: Remove AES crypto device DMA channel definitions
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc arch/arm/mach-omap2/usb-host.c
Simple merge

diff --cc arch/arm/mach-prima2/common.c
index e588c2152133231fbf77dd1a219d782e3d69d586,a9f475cdf603c92ad3f70de4b44817ce5ce59edf..2c70f74fed5dcfc7f0aa6c8d635691ca85a73502
--- 1/arch/arm/mach-prima2/common.c
--- 2/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@@ -45,8 -54,8 +44,7 @@@ DT_MACHINE_START(ATLAS6_DT, "Generic AT
        /* Maintainer: Barry Song <baohua.song@csr.com> */
        .nr_irqs        = 128,
        .map_io         = sirfsoc_map_io,
-       .init_irq       = irqchip_init,
        .init_time      = sirfsoc_init_time,
 -      .init_machine   = sirfsoc_mach_init,
        .init_late      = sirfsoc_init_late,
        .dt_compat      = atlas6_dt_match,
        .restart        = sirfsoc_restart,
@@@ -63,9 -72,9 +61,8 @@@ DT_MACHINE_START(PRIMA2_DT, "Generic PR
        /* Maintainer: Barry Song <baohua.song@csr.com> */
        .nr_irqs        = 128,
        .map_io         = sirfsoc_map_io,
-       .init_irq       = irqchip_init,
        .init_time      = sirfsoc_init_time,
        .dma_zone_size  = SZ_256M,
 -      .init_machine   = sirfsoc_mach_init,
        .init_late      = sirfsoc_init_late,
        .dt_compat      = prima2_dt_match,
        .restart        = sirfsoc_restart,
@@@ -82,8 -91,8 +79,7 @@@ DT_MACHINE_START(MARCO_DT, "Generic MAR
        /* Maintainer: Barry Song <baohua.song@csr.com> */
        .smp            = smp_ops(sirfsoc_smp_ops),
        .map_io         = sirfsoc_map_io,
-       .init_irq       = irqchip_init,
        .init_time      = sirfsoc_init_time,
 -      .init_machine   = sirfsoc_mach_init,
        .init_late      = sirfsoc_init_late,
        .dt_compat      = marco_dt_match,
        .restart        = sirfsoc_restart,

diff --cc arch/arm/mm/mmu.c
Simple merge