| commit | 6c9d370c16aad97cfc6de68666634eaabac2b048 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 12 16:02:06 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 12 16:02:06 2015 -0700 |
| tree | 7af08f77133d5e6329f851514f5758651432d812 | |
| parent | 03906ca389211e167e0d8e9e5ec330e9be467936 [diff] | |
| parent | 620b155034570f577470cf5309f741bac6a6e32b [diff] |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Pull MIPS fixes from Ralf Baechle: "One build fix for build breakage of all MIPS SMP kernels caused by Rusty's fix of obsolete use of cpu mask helpers, another to fix the FP ABI selection when loading an ELF binary" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: fix FP mode selection in lieu of .MIPS.abiflags data MIPS: SMP: Fix build error.