diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-19 23:12:22 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-19 23:12:22 +0200 |
commit | 8bff839927f45731d7d6c6a9a5411670866db122 (patch) | |
tree | 8a483da98db9e803a1b22d736ed1af23ed08c810 /arch/mips/jz4740 | |
parent | Merge branch 'parisc-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | MIPS: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU (diff) | |
download | linux-8bff839927f45731d7d6c6a9a5411670866db122.tar.xz linux-8bff839927f45731d7d6c6a9a5411670866db122.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.2.
Things are looking quite decent at this stage but the recent work on
the FPU support took its toll:
- fix an incorrect overly restrictive ifdef
- select O32 64-bit FP support for O32 binary compatibility
- remove workarounds for Sibyte SB1250 Pass1 parts. There are rare
fixing the workarounds is not worth the effort.
- patch up an outdated and now incorrect comment"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU
MIPS: SB1: Remove support for Pass 1 parts.
MIPS: Require O32 FP64 support for MIPS64 with O32 compat
MIPS: asm-offset.c: Patch up various comments refering to the old filename.
Diffstat (limited to 'arch/mips/jz4740')
0 files changed, 0 insertions, 0 deletions