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)
commitad06bff31fbf0aba4e5faae936e12292a7972b05
tree7a3f2a4da501c10e5821f6e1930a78572ce66d7c
parent20f24208f631141bafe57ce5bcc8f2e7f3c41aae
parentab1a2e038ff2336502e95ec6492c0364a9fc70d0
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
drivers/acpi/internal.h
drivers/acpi/scan.c