From: Ingo Molnar Date: Fri, 21 May 2010 15:53:06 +0000 (+0200) Subject: Merge branch 'tip/tracing/core-7' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.35-rc1~30^2~6 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f80836c86ebd44bf8f90882283a1618e09dfaed2;p=net-next-2.6.git Merge branch 'tip/tracing/core-7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core --- f80836c86ebd44bf8f90882283a1618e09dfaed2