linux-next: manual merge of the powerpc tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/sysdev/fsl_soc.c between commit
4eac6a8b17ce5ebe66eb94b6a0b43aa3a2bf7ea6 ("i2c-mpc: Convert to an
of_platform driver") from the i2c tree and commits
22fb7d9be593181e2f779cf7a8421703a6be713b ("[POWERPC] fsl: Add warning for
unrecognized I2C nodes in the device tree"),
64f9b5ee17ee7974d7cc58d75221432d86960ba3 ("[POWERPC] fsl: Add CS4270 i2c
data to fsl_soc.c") and e026892c85571e12f11abffde5a90bcc704d663e
("[POWERPC] fsl: Update fsl_soc to use cell-index property of I2C nodes")
from the powerpc tree.

The changes from the powerpc tree modify code that the i2c tree removes.
I used the i2c tree's version, but someone should check the result.

-- 
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/20080703/3cf2bb3c/attachment.pgp>