From: Ingo Molnar Date: Fri, 13 Mar 2009 03:33:17 +0000 (+0100) Subject: Merge branches 'tracing/ftrace' and 'linus' into tracing/core X-Git-Tag: v2.6.30-rc1~2^2~42 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6ed8f496fe89ff81b3d6e617a531bedfb613e4;p=pandora-kernel.git Merge branches 'tracing/ftrace' and 'linus' into tracing/core ---