Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jun 2010 21:19:45 +0000 (14:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jun 2010 21:19:45 +0000 (14:19 -0700)
commit7ae1277a5202109a31d8f81ac99d4a53278dab84
treeb32748f82150e4a37b2416ffc2d844cc7d9e7ee5
parentb25b550bb153626df6a48eb8583e923e3dfcf64a
parent85a0e7539781dad4bfcffd98e72fa9f130f4e40d
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / x86: Save/restore MISC_ENABLE register