linux-next: manual merge of the vfs tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/xfs/linux-2.6/xfs_iops.c between commit
293a47c282254cbae1c96cfb2e242e57c050f5c7 ("[XFS] In several places we
directly convert from the XFS inode to the") from the xfs tree and commit
c019d29bf7a7989cab5adfeb4d46c507ea9db087 ("change d_add_ci argument
ordering") from the vfs tree.

I did the obvious fixup and can carry it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/