Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...

* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes
  ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers
  ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h
  ARM: OMAP2+: Move most of plat/io.h into local iomap.h
  ARM: OMAP1: Move most of plat/io.h into local iomap.h
  ARM: OMAP1: Move 16xx GPIO system clock to platform init code
  ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h
  ARM: OMAP2+: Move SDRC related functions from io.h into local common.h
  ARM: OMAP2+: Drop DISPC L3 firewall code
  ARM: OMAP2xxx: PM: remove obsolete timer disable code in the suspend path
  ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config

(update to latest rmk/for-arm-soc branch)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge

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

diff --cc arch/arm/mach-omap2/prm44xx.c
index a1d6154dc120af3ceb056e0616c6d55eee6b17b9,f4c151989c9178fdeb9ff03f545af0e20e76441f..eac623c7c3d86c58869c4804f63ad576631c129a
--- 1/arch/arm/mach-omap2/prm44xx.c
--- 2/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@@ -17,11 -17,11 +17,12 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  
- #include "common.h"
  #include <plat/cpu.h>
 +#include <plat/irqs.h>
  #include <plat/prcm.h>
  
+ #include "iomap.h"
+ #include "common.h"
  #include "vp.h"
  #include "prm44xx.h"
  #include "prm-regbits-44xx.h"