From: Bjorn Helgaas Date: Wed, 3 Apr 2013 00:02:28 +0000 (-0600) Subject: Merge branch 'pci/yinghai-eisa' into for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=be7f088bd01a32e683d5645c8b7f87ca6dfd90b5;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'pci/yinghai-eisa' into for-linus * pci/yinghai-eisa: EISA/PCI: Init EISA early, before PNP EISA/PCI: Fix bus res reference --- be7f088bd01a32e683d5645c8b7f87ca6dfd90b5