Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:47:27 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:47:27 +0000 (12:47 -0700)
commit247dc220f410969b35f884f1554fe9b78119dd59
treed8fc8c3bb86aa5a415edcc25f772bafb6f49b59b
parent94b0522ab77e4d74950e258e804ba05030b6fcff
parent84652e834b11d1d279e9073a94b320c85707a880
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 / MIPS: Convert i8259.c to using syscore_ops