summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-16 00:44:01 (GMT)
committerBjorn Helgaas <bhelgaas@google.com>2013-02-16 00:44:01 (GMT)
commitad06bff31fbf0aba4e5faae936e12292a7972b05 (patch)
tree7a3f2a4da501c10e5821f6e1930a78572ce66d7c /drivers/pci
parent20f24208f631141bafe57ce5bcc8f2e7f3c41aae (diff)
parentab1a2e038ff2336502e95ec6492c0364a9fc70d0 (diff)
downloadlinux-ad06bff31fbf0aba4e5faae936e12292a7972b05.tar.xz
Merge branch 'pci/jiang-pci_slot-kconfig' into next
* pci/jiang-pci_slot-kconfig: ACPI / PCI: Make pci_slot built-in only, not a module
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions