From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 24 Dec 2008 10:15:13 +1100
> Today's linux-next merge of the net tree got a conflict in
> Documentation/DocBook/networking.tmpl between commit
> 66aa675719ab82a03a66b75210fd40be6541f8fb ("wimax: Makefile, Kconfig and
> docbook linkage for the stack") from the usb tree and commit
> 72364706c3b7c09a658e356218a918c5f92dcad0 ("WAN: syncppp.c is no longer
> used by any kernel code. Remove it") from the net tree.
>
> Juts an overlapping add/remove. I fixed it up (see below) and can carry
> the fix as necessary.
Thanks Stephen. You'll need to carry this one.
--
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
