summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-29 11:25:11 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-29 11:25:11 +0100
commit0f01f07fad4ee11d98fe6faa442afbeb0328a378 (patch)
tree74140aedba4597718d270a5ccd74f0e38f32a22e /init
parent3871f2ffe53db3cef4fe0c18993ad9e6e0f69408 (diff)
parent412d0bb553c0227191f1bfd06100f561600bff22 (diff)
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff)
Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' into tracing/core