Hi Krzysztof,
I have been carrying a conflict between your tree, Linus' and the net
trees. Could you please do the following:
merge Linus' tree into yours and fix up the conflict
(Documentation/DocBook/wanbook.tmpl is modified in Linus' tree and
removed in yours)
send commit 8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN:
syncppp.c is no longer used by any kernel code. Remove it") to Dave
Miller to include in the net tree. You can keep it in your tree as well.
Thanks.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpPvQkXy4vYO.pgp
Description: PGP signature
