| commit | b9c9c2558ba366d59dc242872da883a879b8ffc6 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Oct 01 16:45:01 2014 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Oct 01 16:45:01 2014 -0600 |
| tree | b2c15a99796161df92eb27ce80ec6b52cb7ca12f | |
| parent | 5d85142b9e5264a925e4d582c3b0d7297d9c2713 [diff] | |
| parent | c8df6ac9452e8f47a6f660993c526d13e858a6f3 [diff] |
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