From: Tony Lindgren <tony@atomide.com>
Date: Thu, 21 Jan 2010 02:20:47 +0000 (-0800)
Subject: Merge branch 'pm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/khilman/linux... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ccaae273c3f92d7e7acb796d6747077a93dcca4b;p=linux-edison.git

Merge branch 'pm-fixes' of /linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus
---

ccaae273c3f92d7e7acb796d6747077a93dcca4b