Merge branches 'tracing/ftrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 03:33:17 +0000 (04:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 03:33:17 +0000 (04:33 +0100)
commit4c6ed8f496fe89ff81b3d6e617a531bedfb613e4
treeb93b6c8c71c5f2e716dd05b126e01ef4e20ff0af
parent480c93df5b99699390f93a7024c9f60d09da0e96
Merge branches 'tracing/ftrace' and 'linus' into tracing/core