diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 03:47:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 03:47:27 +0100 |
| commit | e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c (patch) | |
| tree | d591a09c68a4b94f25f59d274fd8aea7ac476393 /arch | |
| parent | tracing/core: make the read callbacks reentrants (diff) | |
| parent | tracing/hw-branch-tracing: convert bts-tracer mutex to a spinlock (diff) | |
| parent | Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ad... (diff) | |
| download | linux-e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c.tar.xz linux-e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c.zip | |
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into tracing/core