Merge branch 'pci/host-designware' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 29 Sep 2014 19:24:24 +0000 (13:24 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 29 Sep 2014 19:24:24 +0000 (13:24 -0600)
commit1104528bc769bef26f837097459e1a6e4dae240c
treecd2a4c8bf4c929abd7dfff94b76b1ca8daf12b56
parentc0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4
parent24832b4de315ad00e5430a53772750dfcf18514d
Merge branch 'pci/host-designware' into next

* pci/host-designware:
  PCI: designware: Add get_msi_data() to pcie_host_ops
  PCI: designware: Rename get_msi_data() to get_msi_addr()
  PCI: designware: Fix IO resource end address calculation
  PCI: designware: Fix configuration base address when using 'reg'
  PCI: designware: Use NULL instead of false

[bhelgaas: Fixup keystone for "PCI: designware: Rename get_msi_data() to
get_msi_addr()"]
drivers/pci/host/pci-keystone-dw.c
drivers/pci/host/pci-keystone.c
drivers/pci/host/pci-keystone.h