From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 21 Feb 2017 21:16:08 +0000 (-0600)
Subject: Merge branch 'pci/host-xgene' into next
X-Git-Tag: v4.11-rc1~92^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d534265bdcd47659c9fd080fff4c005512c4770;p=linux.git

Merge branch 'pci/host-xgene' into next

* pci/host-xgene:
  PCI: xgene: Configure PCIe MPS settings
  PCI: xgene: Fix double free on init error
---

9d534265bdcd47659c9fd080fff4c005512c4770