]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 099a39b ccf4665)
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)
commitb97400238913b62c797108c9e20d8e69c5631d83
tree77b414696b5016a9ff36b31f1e626b42bcf5f778tree | snapshot
parent099a39b902bed4cc410340776e299c2c051cfd7ccommit | diff
parentccf4665a77457146ac169ee6e3422746edf8dcf3commit | 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 Source Tree.