Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 23 Jan 2009 10:10:03 +0000 (11:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Jan 2009 10:10:03 +0000 (11:10 +0100)
commit9b03638963e4b239dff1b424b91062a710d4b2e9
tree184bbcc7160c5d0e304166b1ecb190897e1f0afc
parent03b30d151a918364c1c7d08bcb3e167be0a3746f
parent69507c06539332e6e49f83aa478844130233bece
Merge branch 'tracing/ftrace' into tracing/core