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)
commitfce680e9faaa8acc0ab0a931c5fa823b581cbab0
treec96026ec637128c21c665a733db5594ebebbb5a4
parent5e090ed7af10729a396a25df43d69a236e789736
parentce3810cdb4ca31238c87e095d2c494a5eaa4f65d
Merge tag 'for_3.7-fixes-pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm

OMAP PM related fixes for v3.7-rc
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