Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel...
Tony Lindgren [Mon, 31 Jan 2011 21:20:26 +0000 (13:20 -0800)]
1  2 
arch/arm/mach-omap2/pm34xx.c

Simple merge