summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIngo Molnar2009-02-26 03:47:27 +0100
committerIngo Molnar2009-02-26 03:47:27 +0100
commite36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c (patch)
treed591a09c68a4b94f25f59d274fd8aea7ac476393 /fs
parenttracing/core: make the read callbacks reentrants (diff)
parenttracing/hw-branch-tracing: convert bts-tracer mutex to a spinlock (diff)
parentMerge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ad... (diff)
downloadkernel-qcow2-linux-e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c.tar.gz
kernel-qcow2-linux-e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c.tar.xz
kernel-qcow2-linux-e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c.zip
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into tracing/core