summaryrefslogtreecommitdiff
path: root/drivers/misc/ibmasm/heartbeat.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2020-12-16 00:11:06 +0300
committerBjorn Helgaas <bhelgaas@google.com>2020-12-16 00:11:06 +0300
commite8722508dd78609b453b960d0b8163749d1f78b8 (patch)
treea52de7312d11a7ad41a04e00084b45a9557fa204 /drivers/misc/ibmasm/heartbeat.c
parent1559c4b588ecd9f230b7b64d871a850e185412e8 (diff)
parentaa0b1574fd36f6929f0a3094342a08622c80b4d1 (diff)
downloadlinux-e8722508dd78609b453b960d0b8163749d1f78b8.tar.xz
Merge branch 'pci/enumeration'
- Decode PCIe 64 GT/s link speed (Gustavo Pimentel) - De-duplicate Device IDs in the driver dynamic IDs list (Zhenzhong Duan) - Return u8 from pci_find_capability() and similar (Puranjay Mohan) - Return u16 from pci_find_ext_capability() and similar (Bjorn Helgaas) - Include both device and resource name in config space resources (Alexander Lobakin) - Fix ACPI companion lookup for device 0 on the root bus (Rafael J. Wysocki) * pci/enumeration: PCI/ACPI: Fix companion lookup for device 0 on the root bus PCI: Keep both device and resource name for config space remaps PCI: Return u16 from pci_find_ext_capability() and similar PCI: Return u8 from pci_find_capability() and similar PCI: Avoid duplicate IDs in driver dynamic IDs list PCI: Move pci_match_device() ahead of new_id_store() PCI: Decode PCIe 64 GT/s link speed
Diffstat (limited to 'drivers/misc/ibmasm/heartbeat.c')
0 files changed, 0 insertions, 0 deletions