Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 8 Jan 2014 00:34:33 +0000 (17:34 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 8 Jan 2014 00:34:33 +0000 (17:34 -0700)
commitccb126545448136d36da8661f2941372554015d1
tree76d44f07f2b1b9f79f6ff7045c113edeefeafa3b
parent1ecf38c8ae5fab7397f7af65a5064a040940a0a1
parentc2a5a829e28c476880b5efc8755ab3b339fdc147
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Update documentation 00-INDEX file
  PCI: Convert ioapic to be builtin only, not modular