tree 3a047c436154201bfa5bf8682b9379e718d7dcc3
parent 7c7327d9664280cad833da1f14bad13a3ea8f0bf
parent 8d181018532dd709ec1f789e374cda92d7b01ce1
author Linus Torvalds <torvalds@linux-foundation.org> 1242431275 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242431275 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI MSI: Fix MSI-X with NIU cards
  PCI: Fix pci-e port driver slot_reset bad default return value