]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: c6c411a baf67ae)
Merge branch 'pci/enumeration'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 12 Mar 2024 17:14:21 +0000 (12:14 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 12 Mar 2024 17:14:21 +0000 (12:14 -0500)
commit420b8c36069587abf77d2b51fbaa24e9fc5dda67
treed75eafb1d12ed8142bba7a8f8162337c6e3466e7tree
parentc6c411a9489bd16c13e326fb503b46e5322d6eaecommit | diff
parentbaf67aefbe7d7deafa59ca49612d163f8889934ccommit | diff
Merge branch 'pci/enumeration'

-  Collect interrupt-related code in irq.c (Ilpo Järvinen)

- Mark 3ware-9650SE Root Port Extended Tags as broken (Jörg Wedekind)

* pci/enumeration:
  PCI: Mark 3ware-9650SE Root Port Extended Tags as broken
  PCI: Place interrupt related code into irq.c

# Conflicts:
# drivers/pci/Makefile
drivers/pci/Makefile diff1 | diff2 | blob | history
drivers/pci/pci.c diff1 | diff2 | blob | history
drivers/pci/quirks.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.