summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-18 20:21:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-18 20:21:10 +0200
commita58a260fd96b7217b7abc49d107874206f3c55e3 (patch)
tree7eea6b925630abd94d85ebb40295c1b515c6ffb9 /kernel
parentMerge tag 'kbuild-fixes-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentsparc/ftrace: Fix ftrace graph time measurement (diff)
downloadlinux-a58a260fd96b7217b7abc49d107874206f3c55e3.tar.xz
linux-a58a260fd96b7217b7abc49d107874206f3c55e3.zip
Merge git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions