| commit | 247dc220f410969b35f884f1554fe9b78119dd59 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 17 12:47:27 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 17 12:47:27 2011 -0700 |
| tree | d8fc8c3bb86aa5a415edcc25f772bafb6f49b59b | |
| parent | 94b0522ab77e4d74950e258e804ba05030b6fcff [diff] | |
| parent | 84652e834b11d1d279e9073a94b320c85707a880 [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 / MIPS: Convert i8259.c to using syscore_ops