Merge branch 'iomap' into cleanup

diff --cc arch/arm/mach-omap1/include/mach/entry-macro.S
index 83c0250,68d2679..fa0f32a
--- 1/arch/arm/mach-omap1/include/mach/entry-macro.S
--- 2/arch/arm/mach-omap1/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap1/include/mach/entry-macro.S
@@@ -12,8 -13,12 +13,9 @@@
  #include <mach/hardware.h>
  #include <mach/io.h>
  #include <mach/irqs.h>
- #include <asm/hardware/gic.h>
+ 
+ #include "../../iomap.h"
  
 -              .macro  disable_fiq
 -              .endm
 -
                .macro  get_irqnr_preamble, base, tmp
                .endm
  

diff --cc arch/arm/mach-omap1/pm.c
Simple merge

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

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