Merge branch 'for_3.0/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Mon, 13 Jun 2011 14:40:25 +0000 (07:40 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 13 Jun 2011 14:40:25 +0000 (07:40 -0700)
commitc8e0bf95fc01d6e2ca585fe08010800b6c56e823
treef901bdcb5b20e93261cf9cf324ebbcf3fd24ce58
parent9d5ae7cd6cb9ead43336fec1094184d1dc740fbd
parent345f79b3de7f6d651e4dba794af7c7303bdfd649
Merge branch 'for_3.0/pm-fixes' of ssh:///linux/kernel/git/khilman/linux-omap-pm into fixes