Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 23:47:55 +0000 (16:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 23:47:55 +0000 (16:47 -0700)
commit72357d59559e3b9293bdea9c0d755862504f2bf3
tree3a047c436154201bfa5bf8682b9379e718d7dcc3
parent7c7327d9664280cad833da1f14bad13a3ea8f0bf
parent8d181018532dd709ec1f789e374cda92d7b01ce1
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 MSI: Fix MSI-X with NIU cards
  PCI: Fix pci-e port driver slot_reset bad default return value