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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpkFy58xsoJE.pgp
Description: PGP signature
