Hi Al,

Today's linux-next merge of the vfs tree got conflicts in
arch/mips/kernel/irixelf.c and include/asm-mips/namei.h between commit
2957c9e61ee9c37e7ebf2c8acab03e073fe942fd ("[MIPS] IRIX: Goodbye and
thanks for all the fish") from the mips tree and commit
2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
the vfs tree.

I removed both files.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/