Hi all,
On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/ieee1394/eth1394.c between commit
> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
> 1394 driver stack") from the tree and commit
^
I meant to say "the ieee1394 tree".
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpRQVgvgzQzv.pgp
Description: PGP signature
