Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Mon, 8 Oct 2012 22:57:41 +0000 (15:57 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 8 Oct 2012 22:57:41 +0000 (15:57 -0700)
OMAP PM related fixes for v3.7-rc

1  2 
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sr_device.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/omap_device.c
drivers/power/avs/smartreflex.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge