diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-07 13:42:25 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-07 13:42:25 -0500 |
| commit | 6aed468480e8b03ece5a395fe8013e66348a2547 (patch) | |
| tree | d6e55435bfb31eb976396388d1c1531ce2e4479c /drivers/powercap | |
| parent | 7542a046bfddbaadc15f5f3e1845fd333604a5b8 (diff) | |
| parent | 5e14e9fac308daf5607362f879e6de67e0b8dd5b (diff) | |
Merge branch 'pci/host-tango' into next
* pci/host-tango:
PCI: tango: Add Sigma Designs Tango SMP8759 PCIe host bridge support
PCI: Add DT binding for Sigma Designs Tango PCIe controller
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
Diffstat (limited to 'drivers/powercap')
0 files changed, 0 insertions, 0 deletions