projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ced3985
bb44c30
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Fri, 3 Nov 2006 20:28:45 +0000
(12:28 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Fri, 3 Nov 2006 20:28:45 +0000
(12:28 -0800)
* 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"
Trivial merge