Merge branch 'pci/yinghai-eisa' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 3 Apr 2013 00:02:28 +0000 (18:02 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 3 Apr 2013 00:02:28 +0000 (18:02 -0600)
commitbe7f088bd01a32e683d5645c8b7f87ca6dfd90b5
treea9d574f1c99c576094b71abc8263f4ee99f75798
parenta1259041e690916bbea2608115879164c7f85813
parentc5fb301ae83bec6892e54984e6ec765c47df8e10
Merge branch 'pci/yinghai-eisa' into for-linus

* pci/yinghai-eisa:
  EISA/PCI: Init EISA early, before PNP
  EISA/PCI: Fix bus res reference