From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Feb 2014 20:19:06 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v3.14-rc2~13
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d94d0e273eecf3a348c2aab1cad79c2ac4b926be;p=~emulex%2Finfiniband.git

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "hree minor patches.  All have sat in -next for a few days"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: fpu.h: Fix build when CONFIG_BUG is not set
  MIPS: Wire up sched_setattr/sched_getattr syscalls
  MIPS: Alchemy: Fix DB1100 GPIO registration
---

d94d0e273eecf3a348c2aab1cad79c2ac4b926be