From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 24 Nov 2009 14:11:31 +1100
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e1000e/phy.c between commit
> 189983d469c6d98e64ddfb9f9ce76725cb082ee5 ("e1000e: remove unnecessary
> 82577 workaround causing link issues") from the net-current tree and
> commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
> function pointers") from the net tree.
>
> I fixed it up (see below) and can carry the fix for a while.
This conflict also got dealt with last night when I pulled
net-2.6 into net-next-2.6
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
