linux-next: manual merge of the powerpc tree

[Stephen Rothwell]

Hi Paul, Ben,

Today's linux-next merge of the powerpc tree got a conflict in
drivers/net/ibm_newemac/core.h between commit
6fbc779c03591ee536fef9efb7d7e20f281d0b5c ("ibm_newemac: Fix EMAC soft
reset on 460EX/GT") from Linus' tree and commit
b68d185ab12b1fc8000432c5d5ab5404d4788b4c ("ibm_newemac: Allow the "no
flow control" EMAC feature to work") from the powerpc tree.

Just overlapping additions.
-- 
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/20081014/9d1b3ebc/attachment.pgp>