From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 15 Jan 2014 17:52:41 +0000 (-0700)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: v3.14-rc1~132^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1255dfbb0c77c7a26fec10a5c101b075c3641965;p=pandora-kernel.git

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
---

1255dfbb0c77c7a26fec10a5c101b075c3641965
Reading git-diff-tree failed