Subject: linux-next: manual merge of the tracing tree with the parisc tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 1 Apr 2009 11:37:40 +1100

Hi all,

Today's linux-next merge of the tracing tree got a conflict in
arch/parisc/include/asm/ftrace.h between commit
d75f054a2cf0614ff63d534ff21ca8eaab41e713 ("parisc: add ftrace (function
and graph tracer) functionality") from the parisc tree and commit
c79a61f55773d2519fd0525bf58385f7d20752d3 ("tracing: make CALLER_ADDRx
overwriteable") from the tracing tree.

The former adds a non-trivial version of the file, so I used that.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/