tree 7a3f2a4da501c10e5821f6e1930a78572ce66d7c
parent 20f24208f631141bafe57ce5bcc8f2e7f3c41aae
parent ab1a2e038ff2336502e95ec6492c0364a9fc70d0
author Bjorn Helgaas <bhelgaas@google.com> 1360975441 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1360975441 -0700

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