Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2
authorTony Lindgren <tony@atomide.com>
Tue, 12 Feb 2013 17:01:25 +0000 (09:01 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 12 Feb 2013 17:01:25 +0000 (09:01 -0800)
commit25e4d0f6df356ec7c2a09f6744c36a84b5537f33
treede69514f38e1df4f8ac834e0e49fe04ab46ff6b7
parent58a656b77a3d352631d058df0ac2a1da92e3a0f0
parent6efc3fe0f4058d6764e5c58c7377037f9da24d22
Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2