Merge branch 'pci/kevin-bus-to-resource' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 25 May 2013 23:44:24 +0000 (17:44 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 25 May 2013 23:44:24 +0000 (17:44 -0600)
commitb194dbf5eeb4542ff350e30981256c9cb23033fb
tree238458dd309f158b0102c6ebdd8505305e400463
parent755bda3fe3006eae7298f0f58c59313088e30196
parentcf4d1cf5ac5e7d2b886af6ed906ea0dcdc5b6855
Merge branch 'pci/kevin-bus-to-resource' into next

* pci/kevin-bus-to-resource:
  PCI: Unset resource if initial BAR value is invalid
  PCI: Consolidate calls to pcibios_bus_to_resource() in __pci_read_base()
  PCI: Add 0x prefix to BAR register position in __pci_read_base()