Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Sat, 29 Aug 2009 11:06:05 +0000 (13:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 29 Aug 2009 11:06:05 +0000 (13:06 +0200)
commit73222acf966792c7fda219724af963339be32e62
tree83109ded0bcfdc6a0ec5e8ea6becffd7ac41ec6a
parent0dd7b74787eaf7858c6c573353a83c3e2766e674
parent5d4a9dba2d7fbab69f00dedd430d1788834a055a
Merge branch 'tip/tracing/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/core