Merge commit 'ftrace/ppc' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 15 Oct 2009 03:09:11 +0000 (14:09 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 15 Oct 2009 03:09:11 +0000 (14:09 +1100)

Trivial merge