Merge branch 'tip/tracing/core4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Sep 2009 19:16:37 +0000 (21:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Sep 2009 19:16:37 +0000 (21:16 +0200)
commit40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01
tree610700282791b0469bbf09921993857e0b0b51fe
parent983f2163e7fdf11a15e05816de243f93f07eafca
parentb36461da2a0389149d7f88f3cbc05a30d1db9faa
Merge branch 'tip/tracing/core4' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/core