Messages in this thread | | | Date | Mon, 22 Aug 2011 11:51:18 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8 ("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit 3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.
The former commit removes the file, so I just did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |