commit | 2d47b8aac7ba697ffe05f839a3b4c3c628b4e430 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 03 11:06:59 2017 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 03 11:06:59 2017 -0800 |
tree | 566568a61eb9c482bad68c1facecce9a365f36ed | |
parent | 2cb54ce9ee92ae627bc1cef8bea236905910a86d [diff] | |
parent | 26a346f23c5291d1d9521e72763103daf2c6f0d1 [diff] |
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