Merge branch '3.16-fixes' into mips-for-linux-next

diff --cc arch/mips/kernel/ptrace.c
Simple merge

diff --cc arch/mips/kernel/scall64-n32.S
Simple merge

diff --cc arch/mips/mm/tlbex.c
Simple merge

diff --cc arch/mips/rb532/devices.c
Simple merge