Messages in this thread |  | | Date | Mon, 29 Aug 2011 15:54:31 +1000 | | From | Stephen Rothwell <> | | Subject | Re: linux-next: manual merge of the scsi-post-merge tree with the akpm tree |
| |
Hi Andrew,
This was, of course a conflict between the akpm tree and Linus' tree ...
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |