From: Tony Lindgren <tony@atomide.com>
Date: Fri, 16 Dec 2011 22:01:03 +0000 (-0800)
Subject: Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7f760f1abcd1a36b52776c90f6a601dd90f06ecb;p=deliverable%2Flinux.git

Merge branch 'for_3.3/uart/runtime-pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into uart

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

7f760f1abcd1a36b52776c90f6a601dd90f06ecb
diff --cc arch/arm/mach-omap2/pm34xx.c
index 53b5b1a71e0e,4ee5f4eb04e4..fc6987578920
--- a/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;
  }