From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 15 Dec 2008 14:44:05 +1100
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e1000e/ich8lan.c between commit
> 30bb0e0dce78427f3e5cb728d6b5ea73acbefffa ("e1000e: fix double release of
> mutex") from the net-current tree and commit
> 0285c8dcaeaa73ddadc4f38383e5bbc03c394a29 ("e1000e: cosmetic newline in
> debug message") from the net tree.
>
> Trivial context overlap. I fixed it up (see below) and will carry as
> necessary.
Thanks Stephen.
This will be cleared up next time I merge.
--
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
