Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Nov 2006 20:28:45 +0000 (12:28 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Nov 2006 20:28:45 +0000 (12:28 -0800)
commita0d2db26582a67b61f883d1469e561fbdef28419
treee8a4a0bdd1f12fd127d132f1901cee813b06517d
parentced3985faebc232deec0dd9cc375cb5a43d18391
parentbb44c308ee37c14ab63251e27d6d8b4dc73a10a4
Merge /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"