Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
commit58c1f9950ffc6acbb907051b0a4e56aaf4baa9ce
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2016 05:20:56 +0000 (31 22:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2016 05:20:56 +0000 (31 22:20 -0700)
treea24d739eead7f29c345c6cd72f32a8309ea473da
parent367d3fd50566a313946fa9c5b2116a81bf3807e4
parent7cafc0b8bf130f038b0ec2dcdd6a9de6dc59b65a
Merge git://git./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().