projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
414ae76
bb6b42b
)
Merge branch 'pci/switchtec' into next
author
Bjorn Helgaas
<bhelgaas@google.com>
Wed, 31 Jan 2018 16:13:07 +0000
(10:13 -0600)
committer
Bjorn Helgaas
<helgaas@kernel.org>
Wed, 31 Jan 2018 16:13:07 +0000
(10:13 -0600)
* pci/switchtec:
switchtec: Add device IDs for PSX 24xG3 and PSX 48xG3
switchtec: Add Global Fabric Manager Server (GFMS) event
Trivial merge