| commit | 7ae1277a5202109a31d8f81ac99d4a53278dab84 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 11 14:19:45 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 11 14:19:45 2010 -0700 |
| tree | b32748f82150e4a37b2416ffc2d844cc7d9e7ee5 | |
| parent | b25b550bb153626df6a48eb8583e923e3dfcf64a [diff] | |
| parent | 85a0e7539781dad4bfcffd98e72fa9f130f4e40d [diff] |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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