Hi all,
Today's linux-next merge of the ieee1394 tree got a conflict in
drivers/media/dvb/firewire/firedtv-avc.c between commit
154907957f9391b1af997b57507b16c018cc4995 ("firedtv: massive refactoring")
from Linus' tree and commit 0435392b2594edeba33b2173326e73fdcd67bd50
("DVB: firedtv: fix printk format mismatch") from the ieee1394 tree.
I used the latter version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp5dMagwrKbR.pgp
Description: PGP signature
