Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2
authorTony Lindgren <tony@atomide.com>
Wed, 14 Nov 2012 22:50:36 +0000 (14:50 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 14 Nov 2012 22:50:36 +0000 (14:50 -0800)
commit6515b0f75af68ad5e36f5297bb6b9a5ba3e710d2
treeb269fe5e647107a75f677bb01dcec7fc6a41bb67
parent2f4d91e37735de0a22993a06a500dabe332f315e
parent46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2