From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 May 2017 18:21:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a58a260fd96b7217b7abc49d107874206f3c55e3;p=openwrt%2Fstaging%2Fblogic.git

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
---

a58a260fd96b7217b7abc49d107874206f3c55e3