Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Jan 2014 17:52:41 +0000 (10:52 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Jan 2014 17:52:41 +0000 (10:52 -0700)
commit1255dfbb0c77c7a26fec10a5c101b075c3641965
treebd886568c8a932649afa30181f0231b1ae0b3a3b
parenta870614a5371f8e36676e9bb2e089f4121976135
parentebd50b939c33c692a4914e66bf06a99b21ffa483
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Fix pci_check_and_unmask_intx() comment typos
  PCI: Never treat a VF as a multifunction device
drivers/pci/pci.c