Stephen Rothwell wrote:
> 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.
Thanks. I pushed this conflict resolution into linux1394-2.6.git too now.
--
Stefan Richter
-=====-==--= --== --==-
http://arcgraph.de/sr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
