Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
include/asm-sparc64/namei.h include/asm-sparc/namei.h between commit
0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
header files") from the sparc tree and commit
2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
the vfs tree.

I removed the files and the _{32,64} versions as well.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/