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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Jul 2008 17:19:40 +1000

Hi Dave,

Today's linux-next merge of the net tree got a conflict in  between
commits aee1dc73b519227084d77b0b2fc972b68b4153d8 ("[POWERPC] Update
booting-without-of for Freescale PCIe MSI") and
83ff9dcf375c418ca3b98eb950711525ca1269e2 ("powerpc/sysdev: implement FSL
GTM support") from the powerpc tree and commit
a5edeccb1a8432ae5d9fb9bccea5a4b64c565017 ("net: OpenFirmware GPIO based
MDIO bitbang driver") from the net tree.

They are just overlapping additions. I renumbered(?) the "MDIO on GPIOs"
section to 'v'.

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