From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sat, 6 Jan 2007 08:10:37 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.20-rc4~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4497fe1e88cdee984925c2b477e5c73379e00620;p=linux-2.6-omap-h63xx.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:
  [PATCH] PCI: disable PCI_MULTITHREAD_PROBE
---

4497fe1e88cdee984925c2b477e5c73379e00620