Re: linux-next: manual merge of the scsi-post-merge tree with theakpm tree

[Stephen Rothwell]

Hi Andrew,

This was, of course a conflict between the akpm tree and Linus' tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature