From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2009 23:47:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72357d59559e3b9293bdea9c0d755862504f2bf3;p=mv-sheeva.git

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
---

72357d59559e3b9293bdea9c0d755862504f2bf3