diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-02 18:02:28 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-02 18:02:28 -0600 |
| commit | be7f088bd01a32e683d5645c8b7f87ca6dfd90b5 (patch) | |
| tree | a9d574f1c99c576094b71abc8263f4ee99f75798 /drivers/nubus | |
| parent | a1259041e690916bbea2608115879164c7f85813 (diff) | |
| parent | c5fb301ae83bec6892e54984e6ec765c47df8e10 (diff) | |
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/nubus')
0 files changed, 0 insertions, 0 deletions