Subject: linux-next: manual merge of the hdlc tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Oct 2008 17:52:31 +1100

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/syncppp.c between commit
404b12c10d2f4d77649a193af2ec69f77b852926 ("drivers/net/wan/syncppp: Fix
unused-var warnings") from the net-current tree and commit
8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN: syncppp.c is no longer
used by any kernel code. Remove it.") from the hdlc tree.

The former modifies code while the latter removes the whole driver.  I
just removed it.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/