Merge tag 'omap-devel-b-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git... omap-for-v3.9/pm-wfi-take2-signed
authorTony Lindgren <tony@atomide.com>
Mon, 11 Feb 2013 17:20:50 +0000 (09:20 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Feb 2013 17:20:50 +0000 (09:20 -0800)
commit58a656b77a3d352631d058df0ac2a1da92e3a0f0
treeb01c68ffcf0013302dd75a6c9728eba80889f307
parent8d61d7f94522a0c023ed79d4f690f2bfc8a41d96
parent814a18a5d026464f56b3616704b985f9942b29a6
Merge tag 'omap-devel-b-for-3.9' of git://git./linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm-wfi-take2

On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.

Basic test logs are available here:

   http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/

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