Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 22:01:03 +0000 (14:01 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 22:01:03 +0000 (14:01 -0800)
Conflicts:
arch/arm/mach-omap2/pm34xx.c

1  2 
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/cpuidle34xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/pm34xx.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
  }