]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1154768 52eabba)
Merge branch 'pci/switchtec' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:33:41 +0000 (10:33 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:33:41 +0000 (10:33 -0500)
commitd060c6fcef972e6a8d0898c55f1b7b6da89a6744
tree77b414696b5016a9ff36b31f1e626b42bcf5f778tree | snapshot
parent1154768ad342cc3ad295340130c1fad6869effa9commit | diff
parent52eabba5bcdb2853dec6ef007ba427b092034738commit | diff
Merge branch 'pci/switchtec' into next

* pci/switchtec:
  switchtec: Add IOCTLs to the Switchtec driver
  switchtec: Add sysfs attributes to the Switchtec driver
  switchtec: Add user interface documentation
  MicroSemi Switchtec management interface driver

Conflicts:
drivers/pci/Kconfig
MAINTAINERS diff1 | diff2 | blob | history
drivers/pci/Kconfig diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules