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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Dec 2008 14:48:51 +1100

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
arch/sparc64/kernel/idprom.c between commit
a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
("net: convert more to %pM") from the net tree.

The former renamed the file while the latter modified it.  I just deleted
the renamed file for now, the %pM conversion can be done later.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/