From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 May 2015 23:02:06 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6c9d370c16aad97cfc6de68666634eaabac2b048;p=linux-beck.git

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.
---

6c9d370c16aad97cfc6de68666634eaabac2b048