From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 26 Aug 2013 21:40:34 +0000 (-0600)
Subject: Merge branch 'pci/yijing-mps-v8' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=07f2daad094bc9e9770143cd2d619de24d84bb3e;p=deliverable%2Flinux.git

Merge branch 'pci/yijing-mps-v8' into next

* pci/yijing-mps-v8:
  PCI: Warn if unsafe MPS settings detected
  PCI: Fix MPS peer-to-peer DMA comment syntax
  PCI: Don't restrict MPS for slots below Root Ports
  PCI: Simplify MPS test for Downstream Port
  PCI: Remove unnecessary check for pcie_get_mps() failure
  PCI: Simplify pcie_bus_configure_settings() interface
  PCI: Drop "PCI-E" prefix from Max Payload Size message
---

07f2daad094bc9e9770143cd2d619de24d84bb3e