tree b68ca8f813e92e6b405f0a4fb81d3545835a39ae
parent f414ca64be4b36c30deb5b5fa25c5a8ff42ea56b
parent d825c06bfe8b885b797f917ad47365d0e9c21fbb
author Linus Torvalds <torvalds@linux-foundation.org> 1457899486 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1457899486 -0700

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "Another round of MIPS fixes for 4.5:

   - Fix JZ4780 build with DEBUG_ZBOOT and MACH_JZ4780
   - Fix build with DEBUG_ZBOOT and MACH_JZ4780
   - Fix issue with uninitialised temp_foreign_map
   - Fix awk regex compile failure with certain versions of awk.  At
     this time, the sole user, ld-ifversion, is only used on MIPS"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: smp.c: Fix uninitialised temp_foreign_map
  MIPS: Fix build error when SMP is used without GIC
  ld-version: Fix awk regex compile failure
  MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4780