Merge branch 'pci/myron-final-fixups-v2' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 16 Jul 2012 15:17:43 +0000 (09:17 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 16 Jul 2012 15:17:43 +0000 (09:17 -0600)
commit8d20e2cfeb4a098a4dd0bd637c5ea93aa9e84983
tree2ec88f9533c6bd4de1efd5dfe09762e381739aa0
parentcfeeb34bc04648a61840e5376925cf9094da5ea6
parent95df8b8708a8b381bf276d83c56f7b4e7de04a71
Merge branch 'pci/myron-final-fixups-v2' into next

* pci/myron-final-fixups-v2:
  PCI: fix undefined reference to 'pci_fixup_final_inited'
drivers/pci/quirks.c