linux-next: manual merge of the mips tree with Linus' tree
From: Stephen Rothwell
Date: Thu Feb 12 2015 - 19:12:11 EST
Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/elf.c between commit fd75a33e0002 ("MIPS: ELF: fix
loading o32 binaries on 64-bit kernels") from Linus' tree and commit
d8fb6537f1d4 ("MIPS: kernel: elf: Improve the overall ABI and FPU mode
checks") from the mips tree.
I fixed it up (the latter seems to be a superset of the former) and can
carry the fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: OpenPGP digital signature