summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-09-16 05:25:06 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-16 05:25:06 +0200
commit8d93c7a4315711ea0f7a95ca353a89c4ed0763fb (patch)
tree256e06d8a485d48f780e311a62e7fdb49f154b91 /drivers/watchdog
parentMerge tag 'drm-fixes-for-v4.14-rc1' of git://people.freedesktop.org/~airlied/... (diff)
parentRevert "PCI: Avoid race while enabling upstream bridges" (diff)
downloadlinux-8d93c7a4315711ea0f7a95ca353a89c4ed0763fb.tar.xz
linux-8d93c7a4315711ea0f7a95ca353a89c4ed0763fb.zip
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')
0 files changed, 0 insertions, 0 deletions