Linus Torvalds 9682b3dea2 Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial %!s(int64=7) %!d(string=hai) anos
..
Makefile 44ad18e0a6 tracing: update sample event documentation %!s(int64=16) %!d(string=hai) anos
trace-events-sample.c a0cb2b5c39 Fix tracing sample code warning. %!s(int64=7) %!d(string=hai) anos
trace-events-sample.h 9682b3dea2 Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial %!s(int64=7) %!d(string=hai) anos