linux-next: manual merge of the galak tree

[Stephen Rothwell]

Hi Kumar,

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

I left the "MDIO on GPIOs" section there and relabeled it as 'g'.
-- 
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/20080710/2d15461e/attachment.pgp>