Merge branch 'tip/tracing/ftrace-4' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Jun 2009 14:50:29 +0000 (16:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Jun 2009 14:50:29 +0000 (16:50 +0200)
commit918143e8b7d6153d7a83a3f854323407939f4a7e
tree34c0b1434516d146fc3811a6d071b052dd59342b
parent64edbc562034f2ec3fce382cb208fab40586d005
parent563af16c30ede41eda2d614195d88e07f7c7103d
Merge branch 'tip/tracing/ftrace-4' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace