| commit | be7f088bd01a32e683d5645c8b7f87ca6dfd90b5 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue Apr 02 18:02:28 2013 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue Apr 02 18:02:28 2013 -0600 |
| tree | a9d574f1c99c576094b71abc8263f4ee99f75798 | |
| 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