From: Linus Torvalds Date: Thu, 9 Apr 2009 17:37:46 +0000 (-0700) Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v2.6.30-rc2~100 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c2ea122cd7c4a094be71641f3961796398035513;p=~shefty%2Frdma-dev.git Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: consolidate documents blktrace: pass the right pointer to kfree() tracing/syscalls: use a dedicated file header tracing: append a comma to INIT_FTRACE_GRAPH --- c2ea122cd7c4a094be71641f3961796398035513