From: Tony Lindgren <tony@atomide.com>
Date: Wed, 22 Dec 2010 01:05:57 +0000 (-0800)
Subject: Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman... 
X-Git-Tag: MMI-PSA29.97-13-9~21439^2~16^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9e7683bbca638967a56e5d7fd4035a947109621;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'pm-opp' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
---

b9e7683bbca638967a56e5d7fd4035a947109621