Subject: linux-next: manual merge of the pxa tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 19 Sep 2008 04:46:26 +1000

Hi Eric,

Today's linux-next merge of the pxa tree got a lot of conflicts against
the arm tree.  Unfortunately, I don't have time today to resolve them, so
you should probably rebase your tree on the arm tree (or merge the arm
tree into yours) and resolve the conflicts.

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