Merge branch 'for_3.1/pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Wed, 10 Aug 2011 10:36:42 +0000 (03:36 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Aug 2011 10:36:42 +0000 (03:36 -0700)
commit58cf5e7fd5554735901dc855f5d4c16c59331dd5
tree313ed295ec518b7bbc3d3ba952fc4fe430dc2ace
parentc9a48c2aac235f7a7e31fb7214a33afcd0da26b7
parent98333b3dda1e490b02304a6a6643c294d4e520c3
Merge branch 'for_3.1/pm-fixes' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes