From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 May 2015 22:46:30 +0000 (-0700)
Subject: Merge branch 'master' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.1-rc4~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=518af3cb8ccaf32057db6046e241ec393d6c7b98;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

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

Pull MIPS fixes from Ralf Baechle:
 "Seven small fixes.  The shortlog below is a good description so no
  need to elaborate.

  It has sat in linux-next and survived the usual automated testing by
  Imagination's test farm"

* 'master' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: tlb-r4k: Fix PG_ELPA comment
  MIPS: Fix up obsolete cpu_set usage
  MIPS: IP32: Fix build errors in reset code in DS1685 platform hook.
  MIPS: KVM: Fix unused variable build warning
  MIPS: traps: remove extra Tainted: line from __show_regs() output
  MIPS: Fix wrong CHECKFLAGS (sparse builds) with GCC 5.1
  MIPS: Fix a preemption issue with thread's FPU defaults
---

518af3cb8ccaf32057db6046e241ec393d6c7b98