Re: Resolved XFS conflict in next-creds

[Stephen Rothwell]

Hi James,

On Thu, 14 Aug 2008 12:42:55 +1000 (EST) James Morris <jmorris@xxxxxxxxx> wrote:
>
> I resolved the following conflict with Linus' tree in:
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds

Thanks.  I have fetched it for today's linux-next.

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

Attachment: pgp00000.pgp
Description: PGP signature