# linux-next: manual merge of the galak tree

- From: Stephen Rothwell \<hidden\>
- Date: 2008-07-10 04:15:52 
- List: linuxppc-dev
- Page: https://ratatoskr.run/linuxppc-dev/2008/07/8894613
- Thread: https://ratatoskr.run/linux-next/2008/07/8894613/t.md

```text
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
```

## Attachments

- [(unnamed)](https://ratatoskr.run/linuxppc-dev/2008/07/8894613/attachment/0) (application/pgp-signature, 197 bytes)