Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 28 May 2014 22:21:25 +0000 (16:21 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 28 May 2014 22:21:25 +0000 (16:21 -0600)
commitfdaf36bd360fe1e74b34262ad705ef39d52c12de
treeb686d69b0c5bf74ac0cd704123d64bfcdb3c10f5
parentd1a2523d2adc0b6910dbc2a9aed44c4217134db1
parentd97ffe236894856d08146390ef3fbe6448a8ac2b
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Fix return value from pci_user_{read,write}_config_*()
  PCI: Turn pcibios_penalize_isa_irq() into a weak function
  PCI: Test for std config alias when testing extended config space
drivers/pci/pci.c
drivers/pci/probe.c
include/linux/pci.h