From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 3 Nov 2006 20:28:45 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.19-rc5~26
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a0d2db26582a67b61f883d1469e561fbdef28419;p=~shefty%2Frdma-dev.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN
  PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable"
---

a0d2db26582a67b61f883d1469e561fbdef28419