diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-02 22:37:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-02 22:37:35 +0100 |
| commit | fdfa66ab455c79d699833c43ac0e09900133fd7c (patch) | |
| tree | 5ede20eaf13eab51c3a391e002a4e9988aa3e787 /include/linux | |
| parent | Merge branch 'tracing/ftrace' into tracing/core (diff) | |
| parent | Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace (diff) | |
| parent | x86 mmiotrace: fix race with release_kmmio_fault_page() (diff) | |
Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core