Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Sat, 6 Jan 2007 08:10:37 +0000 (00:10 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sat, 6 Jan 2007 08:10:37 +0000 (00:10 -0800)
commit4497fe1e88cdee984925c2b477e5c73379e00620
tree751a77ef872e242229c3c9968799d7baed0ac952
parentf87c8e80545fd277f69521ef859c3e71c6af5656
parentfd8d4b11354a8a33ef61b06fa64880c2c6d25ae4
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  [PATCH] PCI: disable PCI_MULTITHREAD_PROBE