Merge tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Feb 2017 19:06:59 +0000 (11:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Feb 2017 19:06:59 +0000 (11:06 -0800)
commit2d47b8aac7ba697ffe05f839a3b4c3c628b4e430
tree566568a61eb9c482bad68c1facecce9a365f36ed
parent2cb54ce9ee92ae627bc1cef8bea236905910a86d
parent26a346f23c5291d1d9521e72763103daf2c6f0d1
Merge tag 'trace-v4.10-rc2-2' of git://git./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