diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-31 19:13:07 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-31 19:13:07 +0300 |
| commit | 6a436fa81252b3a302d61133c784472a237b6dd7 (patch) | |
| tree | b27ae295c39997e681fb40e88a9d1ed6edf633a7 /drivers/fpga/fpga-mgr.c | |
| parent | 414ae7609e19580a56647344e61f13f3768e0820 (diff) | |
| parent | bb6b42b4fb8e4b488c1282fa7c0f26953ceef0b4 (diff) | |
| download | linux-6a436fa81252b3a302d61133c784472a237b6dd7.tar.xz | |
Merge branch 'pci/switchtec' into next
* pci/switchtec:
switchtec: Add device IDs for PSX 24xG3 and PSX 48xG3
switchtec: Add Global Fabric Manager Server (GFMS) event
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions