summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 13:25:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 13:25:47 -0700
commita048d3aff8b828b6c0fa7ddd90a531248ab4e0f9 (patch)
tree8edfb5bd152aef0d48c4a165247906db347c3a56 /arch
parentfb3b80614438f8b73b3879a19350439d6aa402da (diff)
parent1fe371044b21b226b96a9dd959e971b50b28c78e (diff)
downloadlinux-stable-a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9.tar.gz
linux-stable-a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9.tar.bz2
linux-stable-a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9.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 modular build ftrace: disable tracing on acpi idle calls ftrace: remove latency-tracer leftover ftrace: only trace preempt off with preempt tracer ftrace: fix 4d3702b6 (post-v2.6.26): WARNING: at kernel/lockdep.c:2731 check_flags (ftrace)
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions