From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Feb 2013 17:20:50 +0000 (-0800)
Subject: Merge tag 'omap-devel-b-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-for-v3.9/pm-wfi-take2-signed^0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58a656b77a3d352631d058df0ac2a1da92e3a0f0;p=pandora-kernel.git

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
---

58a656b77a3d352631d058df0ac2a1da92e3a0f0
Reading git-diff-tree failed