]> Pileus Git - ~andy/linux/commitdiff
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)
* pci/misc:
  PCI: Update documentation 00-INDEX file
  PCI: Convert ioapic to be builtin only, not modular


Trivial merge