From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Jul 2018 19:32:28 +0000 (-0700)
Subject: Merge tag 'mips_fixes_4.18_5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7648c44680de90a0b656a55813fed5f6621512c5;p=linux.git

Merge tag 'mips_fixes_4.18_5' of git://git./linux/kernel/git/mips/linux

Pull MIPS fix from Paul Burton:
 "Here's one more MIPS fix, reverting an errata workaround that was
  merged for v4.18-rc2 but has since been found to cause system hangs on
  some BCM4718A1-based systems by the OpenWRT project"

* tag 'mips_fixes_4.18_5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum"
---

7648c44680de90a0b656a55813fed5f6621512c5