]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit59974b6b9a88bb96b43ef8476ec70dcb581d0623
tree566568a61eb9c482bad68c1facecce9a365f36ed
parentb5e6761a4fed2fb97059c5c0ed7ddaaf0afac003
parent9bc5bc032d7df154c49c477d17eca9066df102af
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