path: root/Makefile
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-25 17:55:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-25 17:55:04 -0800
commitc2a65d3d85a08b6c93da7b8664c89d1cd0682adf (patch)
tree0c207d8628b3c518ec0849208eb2023d297937b3 /Makefile
parent194d9831f0419b5125dc94ec0ece4434d8ef74f0 (diff)
parenta3cea9894157c20a5b1ec08b7e0b5f2019740c10 (diff)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle: "Three issues fixed accross the field: - Some functions that were recently outlined as part of a preemption fix were causing problems with function tracing. - The recently merged in-kernel MPI library uses very outdated headers that contain MIPS-specific code which won't build on with gcc 4.4 or newer. - The MIPS non-NUMA memory initialization was making only a very half-baked attempt at merging adjacent memory ranges. This kept the code simple enough but is now causing issues with kexec." * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MPI: Fix compilation on MIPS with GCC 4.4 and newer MIPS: Fix crash that occurs when function tracing is enabled MIPS: Merge overlapping bootmem ranges
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions