Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel...

Conflicts:
	arch/arm/mach-omap2/pm34xx.c

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

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

diff --cc arch/arm/mach-omap2/pm34xx.c
index 53b5b1a,4ee5f4e..fc69875
--- 1/arch/arm/mach-omap2/pm34xx.c
--- 2/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@@ -541,8 -539,6 +500,7 @@@ static int omap3_pm_begin(suspend_state
  {
        disable_hlt();
        suspend_state = state;
-       omap_uart_enable_irqs(0);
 +      omap_prcm_irq_prepare();
        return 0;
  }