Merge branch 'pci/vpd' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Feb 2017 17:56:12 +0000 (11:56 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Feb 2017 17:56:12 +0000 (11:56 -0600)
* pci/vpd:
  PCI: Increase VPD access timeout to 125ms

1  2 
drivers/pci/access.c

Simple merge