summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-13 13:04:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-13 13:04:46 -0700
commita26555498849489fb87139a15abe2eeb8a366ae7 (patch)
treeb68ca8f813e92e6b405f0a4fb81d3545835a39ae /Makefile
parentf414ca64be4b36c30deb5b5fa25c5a8ff42ea56b (diff)
parentd825c06bfe8b885b797f917ad47365d0e9c21fbb (diff)
downloadlinux-a26555498849489fb87139a15abe2eeb8a366ae7.tar.gz
linux-a26555498849489fb87139a15abe2eeb8a366ae7.tar.bz2
linux-a26555498849489fb87139a15abe2eeb8a366ae7.zip
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions