Merge commit 'v2.6.28-rc3' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Mon, 3 Nov 2008 08:11:13 +0000 (09:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 3 Nov 2008 08:11:13 +0000 (09:11 +0100)
commit36609469c8278554b046aa4cc9a5fa9ccea35306
treef59185b71c8059941de79143f71178453599b8f1
parentb3acf29afda06c76774dc6df6246c37ae707836b
parent45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03
Merge commit 'v2.6.28-rc3' into tracing/ftrace
kernel/trace/trace.c