diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
commit | 64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch) | |
tree | 0b8ed22d46d775f04d441e8c480c12ec297a005b /init/Kconfig | |
parent | tracing/function-graph-tracer: fix merge (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.xz linux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip |
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions