aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-20 13:11:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-20 13:11:21 -0800
commit95763dd52b4b9b3578d3428001ece1e11b016ffc (patch)
treefae1b9baa31810dcf45aa2fe2ab38a8fdbbd1a43 /drivers
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentMerge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent (diff)
downloadlinux-dev-95763dd52b4b9b3578d3428001ece1e11b016ffc.tar.xz
linux-dev-95763dd52b4b9b3578d3428001ece1e11b016ffc.zip
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: ftrace: fix dyn ftrace filter selection ftrace: make filtered functions effective on setting ftrace: fix set_ftrace_filter trace: introduce missing mutex_unlock() tracing: kernel/trace/trace.c: introduce missing kfree()
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions