linux-next: manual merge of the net tree
Stephen Rothwell
sfr at canb.auug.org.au
Tue Jul 1 17:19:40 EST 2008
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 sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20080701/26010fa3/attachment.pgp>
More information about the Linuxppc-dev
mailing list