Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
commita58a260fd96b7217b7abc49d107874206f3c55e3
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 May 2017 18:21:10 +0000 (18 11:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 May 2017 18:21:10 +0000 (18 11:21 -0700)
tree7eea6b925630abd94d85ebb40295c1b515c6ffb9
parent5396a018f3e0793204985c205622711f61afadfd
parent48078d2dac0a26f84f5f3ec704f24f7c832cce14
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Three sparc bug fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc/ftrace: Fix ftrace graph time measurement
  sparc: Fix -Wstringop-overflow warning
  sparc64: Fix mapping of 64k pages with MAP_FIXED