diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-02 00:45:01 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-02 00:45:01 +0200 |
commit | b9c9c2558ba366d59dc242872da883a879b8ffc6 (patch) | |
tree | b2c15a99796161df92eb27ce80ec6b52cb7ca12f /drivers/oprofile | |
parent | Merge branch 'pci/resource' into next (diff) | |
parent | PCI: designware: Remove open-coded bitmap operations (diff) | |
download | linux-b9c9c2558ba366d59dc242872da883a879b8ffc6.tar.xz linux-b9c9c2558ba366d59dc242872da883a879b8ffc6.zip |
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
Diffstat (limited to 'drivers/oprofile')
0 files changed, 0 insertions, 0 deletions