Merge branch 'pci/jiang-pci_slot-kconfig' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 16 Feb 2013 00:44:01 +0000 (17:44 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 16 Feb 2013 00:44:01 +0000 (17:44 -0700)
* pci/jiang-pci_slot-kconfig:
  ACPI / PCI: Make pci_slot built-in only, not a module


Trivial merge