diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-25 17:55:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-25 17:55:04 -0800 |
| commit | c2a65d3d85a08b6c93da7b8664c89d1cd0682adf (patch) | |
| tree | 0c207d8628b3c518ec0849208eb2023d297937b3 /COPYING | |
| parent | Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | MPI: Fix compilation on MIPS with GCC 4.4 and newer (diff) | |
| download | linux-dev-c2a65d3d85a08b6c93da7b8664c89d1cd0682adf.tar.xz linux-dev-c2a65d3d85a08b6c93da7b8664c89d1cd0682adf.zip | |
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 'COPYING')
0 files changed, 0 insertions, 0 deletions