linux-next: manual merge of the bluetooth tree with Linus' tree

Thu, 28 Feb 2013 17:55:20 -0800 

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/rfcomm/core.c between commit 25cc4ae913a4 ("net: remove
redundant check for timer pending state before del_timer") from Linus' tree
and commit 5c87e6efd14d ("Bluetooth: Avoid rfcomm_session_timeout using
freed session") from the bluetooth tree.

I fixed it up (I just used the bluetooth tree version) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgpcFOfDUDxR5.pgp
Description: PGP signature

Reply via email to