Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 00:12:29 +0000 (16:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 00:12:29 +0000 (16:12 -0800)
commit1c70132ffbd3c93558c1c0b34ae228543391f355
treea806ccfed6ef97f7aa310e86a80e41313be420f7
parent22c6b32d8d9b7adf903c19b7e108062431fdc6fc
parentfe6b91f47080eb17d21cbf2a39311877d57f6938
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/linux-pm

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Driver core: leave runtime PM enabled during system shutdown