summaryrefslogtreecommitdiff
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-04-02 18:02:28 -0600
committerBjorn Helgaas <bhelgaas@google.com>2013-04-02 18:02:28 -0600
commitbe7f088bd01a32e683d5645c8b7f87ca6dfd90b5 (patch)
treea9d574f1c99c576094b71abc8263f4ee99f75798 /drivers/acpi/pci_root.c
parenta1259041e690916bbea2608115879164c7f85813 (diff)
parentc5fb301ae83bec6892e54984e6ec765c47df8e10 (diff)
downloadlinux-3.10-be7f088bd01a32e683d5645c8b7f87ca6dfd90b5.tar.gz
linux-3.10-be7f088bd01a32e683d5645c8b7f87ca6dfd90b5.tar.bz2
linux-3.10-be7f088bd01a32e683d5645c8b7f87ca6dfd90b5.zip
Merge branch 'pci/yinghai-eisa' into for-linus
* pci/yinghai-eisa: EISA/PCI: Init EISA early, before PNP EISA/PCI: Fix bus res reference
Diffstat (limited to 'drivers/acpi/pci_root.c')
0 files changed, 0 insertions, 0 deletions