]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit43e69c703bc5b2dd25903cb28b94d1d6e21bbe7e
tree7a3f2a4da501c10e5821f6e1930a78572ce66d7c
parent48cf821b1c00f3b8dcc6def731225bf0019d2474
parent886d5a41dbc89922496451a70db460389f98374c
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