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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Jul 2008 18:56:45 +1000

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/cosa.c between commit
0911810755fc9f15659cc3cb43912633b90027a0 ("cosa: cdev lock_kernel()
pushdown") from the blk-removal tree and commit
d2e510df1fe342b6df51c1af036ca28a60f6fc55 ("WAN: Port COSA driver to
generic HDLC") from the hdlc tree.

Just a simple overlapping change. I can carry the fixup.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/