parent 22c6b32d8d9b7adf903c19b7e108062431fdc6fc
parent fe6b91f47080eb17d21cbf2a39311877d57f6938
author Linus Torvalds <torvalds@linux-foundation.org> 1323303149 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323303149 -0800

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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
�