From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Feb 2017 19:06:59 +0000 (-0800)
Subject: Merge tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v4.10-rc7~14
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=2d47b8aac7ba697ffe05f839a3b4c3c628b4e430;p=karo-tx-linux.git

Merge tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Simple fix of s/static struct __init/static __init struct/"

* tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/kprobes: Fix __init annotation
---

2d47b8aac7ba697ffe05f839a3b4c3c628b4e430