linux-next: manual merge of the staging tree with the tty tree

Wed, 28 Nov 2012 20:48:03 -0800 

Hi Greg,

Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/fwserial/fwserial.c, drivers/staging/Kconfig and
drivers/staging/Kconfig between commit 7355ba3445f2 ("staging: fwserial:
Add TTY-over-Firewire serial driver") from the tty tree and commit
e5711071ad94 ("staging: fwserial: Add TTY-over-Firewire serial driver")
from the staging tree.

I am not sure why this patch exists in both trees :-(

I fixed it up (they are the same but the trees contain more commits
affecting these files) and can carry the fix as necessary (no action is
required).

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

Attachment: pgpzkWfpT6IyW.pgp
Description: PGP signature

Reply via email to