Subject: linux-next: manual merge of the tip tree with the mips tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 23 Nov 2009 16:46:07 +1100

Hi all,

Today's linux-next merge of the tip tree got a conflict in
scripts/recordmcount.pl between commit
8faf0bcd7be5c9a86223a857f78e033e9cf5f1f5 ("MIPS: Tracing: Add an endian
argument to scripts/recordmcount.pl") from the mips tree and commit
e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
number of arguments in recordmcount.pl") from the tip tree.

Just two updates to the same line.  I fixed it up (using the mips tree
version) and can carry the fix as necessary.  Thanks again, Ralf, for the
heads up.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/