From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 1 Oct 2014 22:45:01 +0000 (-0600)
Subject: Merge branch 'pci/host-designware' into next
X-Git-Tag: v3.18-rc1~110^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9c9c2558ba366d59dc242872da883a879b8ffc6;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/host-designware' into next

* pci/host-designware:
  PCI: designware: Remove open-coded bitmap operations
  PCI: designware: Setup and clear exactly one MSI at a time

Conflicts:
	drivers/pci/host/pcie-designware.c
---

b9c9c2558ba366d59dc242872da883a879b8ffc6