diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 15:28:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 15:28:45 -0500 |
| commit | a0d2db26582a67b61f883d1469e561fbdef28419 (patch) | |
| tree | e8a4a0bdd1f12fd127d132f1901cee813b06517d /fs | |
| parent | ced3985faebc232deec0dd9cc375cb5a43d18391 (diff) | |
| parent | bb44c308ee37c14ab63251e27d6d8b4dc73a10a4 (diff) | |
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"
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions