Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 20:54:37 +0000 (13:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 20:54:37 +0000 (13:54 -0700)
commit77d431641e2b402fe98af3540e8fb1c77bf92c25
treee12e03874dab30dc42247fa130dcd09d719a9bb1
parent55a7d4b85ca1f723d26b8956e8faeff730d0d240
parentf01cae4e1a9bc845ee125cdb763ccf18298d3fdc
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Sparc perf stack traversal fixes from David Ahern"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: perf: Use UREG_FP rather than UREG_I6
  sparc64: perf: Add sanity checking on addresses in user stack
  sparc64: Convert BUG_ON to warning
  sparc: perf: Disable pagefaults while walking userspace stacks