diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:37 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:37 -0500 |
commit | d1640a83073c08cfe237d54db1b251cf63a4ce90 (patch) | |
tree | 8a7ac4274aa239b7200b0e2cc1ca4c3ea536d8c6 /drivers/w1 | |
parent | 5bedfdb2ff8b92e06fe575524f477a9143724f0b (diff) | |
parent | b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6 (diff) | |
download | linux-d1640a83073c08cfe237d54db1b251cf63a4ce90.tar.gz linux-d1640a83073c08cfe237d54db1b251cf63a4ce90.tar.bz2 linux-d1640a83073c08cfe237d54db1b251cf63a4ce90.zip |
Merge branch 'remotes/lorenzo/pci/aardvark'
- Fix s390 build error (Pali Rohár)
- Check for errors from pci_bridge_emul_init() (Pali Rohár)
- Export pci-bridge-emul functions for use by modules (Pali Rohár)
- Make aardvark driver modular (Pali Rohár)
- Move PCIe reset code to advk_pcie_train_link() (Pali Rohár)
- Convert internal SMCC firmware return codes to errno (Pali Rohár)
- Fix initialization with old Marvell's Arm Trusted Firmware (Pali Rohár)
* remotes/lorenzo/pci/aardvark:
PCI: aardvark: Fix initialization with old Marvell's Arm Trusted Firmware
phy: marvell: comphy: Convert internal SMCC firmware return codes to errno
PCI: aardvark: Move PCIe reset card code to advk_pcie_train_link()
PCI: aardvark: Implement driver 'remove' function and allow to build it as module
PCI: pci-bridge-emul: Export API functions
PCI: aardvark: Check for errors from pci_bridge_emul_init() call
PCI: aardvark: Fix compilation on s390
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions