From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jun 2016 05:20:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v4.7-rc2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=58c1f9950ffc6acbb907051b0a4e56aaf4baa9ce;p=users%2Fjedix%2Flinux-maple.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "sparc64 mmu context allocation and trap return bug fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix return from trap window fill crashes.
  sparc: Harden signal return frame checks.
  sparc64: Take ctx_alloc_lock properly in hugetlb_setup().
---

58c1f9950ffc6acbb907051b0a4e56aaf4baa9ce