linux-next: manual merge of the net tree

From: Stephen Rothwell <hidden>
Date: 2008-07-16 06:56:54

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
Documentation/powerpc/booting-without-of.txt between commit
d0fc2eaaf4c56a95f5ed29b6bfb609e19714fc16 ("powerpc/fsl: Refactor device
bindings") from the powerpc tree and commit
a5edeccb1a8432ae5d9fb9bccea5a4b64c565017 ("net: OpenFirmware GPIO based
MDIO bitbang driver") from the net tree.

I just added the new section from the latter commit in as section 'g'.
It may not even belong in this file any more, but I don't know.  Kumar?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help