projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/pci/Kconfig patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/pci/Kconfig
index 9747c1ec8c74389cc152a630a57b68560854ce59,c0bb4cbd1edbe3babca692d4f90022813702a82d..e0cacb7b8563468fe9ce98ed603e176f267c7ac7
--- 1/drivers/pci/Kconfig
--- 2/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@@ -134,4 -134,4 +134,5 @@@ config PCI_HYPER
  source "drivers/pci/hotplug/Kconfig"
  source "drivers/pci/dwc/Kconfig"
  source "drivers/pci/host/Kconfig"
 +source "drivers/pci/endpoint/Kconfig"
+ source "drivers/pci/switch/Kconfig"