Subject: linux-next: arm/mer-current merge conflict

From: Stephen Rothwell <[email-masked]>
Date: Tue, 3 Jun 2008 14:04:21 +1000

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-pxa/tosa.c between commit
0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 ("[ARM] pxa: fix tosa.c build
error") from the arm-current tree and commit
a37cba9e5315bb57e8eb135e401ba35e4b2338ac ("[ARM] 5048/2: Clean up tosa
and spitz resetting") from the arm tree.  I used the latter since the
former's commit message implied that this was the right fix.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/