projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cb54ce 26a346f)
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)
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


Trivial merge
John Crispins staging tree