Merge branch 'for_3.4/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 18:31:38 +0000 (11:31 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 18:31:38 +0000 (11:31 -0700)
commit08956f1c5883f66c2e547f8137061c6b58ccbb53
tree3112bdeac2bf85b7c3dafacbb42b687d09fbc5f2
parent3916043576ecefe01818684b38c73695322fd29f
parent4ba7c3c3c6567210bf46b1ab3d089134170c2762
Merge branch 'for_3.4/fixes/pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/pm44xx.c
arch/arm/mach-omap2/prm_common.c