Merge branch 'ppc/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Sun, 23 Nov 2008 12:47:54 +0000 (13:47 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 23 Nov 2008 12:47:54 +0000 (13:47 +0100)

Trivial merge