diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-16 06:25:06 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-16 06:25:06 +0300 |
| commit | 8d93c7a4315711ea0f7a95ca353a89c4ed0763fb (patch) | |
| tree | 256e06d8a485d48f780e311a62e7fdb49f154b91 /drivers/watchdog/octeon-wdt-nmi.S | |
| parent | 02cfe977e813501ad0e524477eb5cd5b52860448 (diff) | |
| parent | 0f50a49e3008597abed0fff052d487f77db89093 (diff) | |
| download | linux-8d93c7a4315711ea0f7a95ca353a89c4ed0763fb.tar.xz | |
Merge tag 'pci-v4.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"Revert an attempt to fix a race while enabling upstream bridges
because it broke iwlwifi firmware loading"
* tag 'pci-v4.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Revert "PCI: Avoid race while enabling upstream bridges"
Diffstat (limited to 'drivers/watchdog/octeon-wdt-nmi.S')
0 files changed, 0 insertions, 0 deletions