]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
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)
* pci/misc:
  PCI: Fix pci_check_and_unmask_intx() comment typos
  PCI: Never treat a VF as a multifunction device

1  2 
drivers/pci/pci.c

Simple merge