Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 23:44:37 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 23:44:37 +0000 (16:44 -0700)
commitecca1c5e3a55d1581be9aa9144642c67de70e33b
tree9ddf9cd7ca85657a834a5819bf9dc6a04bcad21a
parent5805977e63a36ad56594a623f3bd2bebcb7db233
parentb3bad72e494fb2ff0c81be4ca2ddb94adf6a47c2
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI PM: Fix initialization and kexec breakage for some devices