Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

diff --cc fs/xfs/linux-2.6/xfs_ioctl.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_iops.c
index 9b8ee3470ecc6448b6527db7de1f4aba10dec775,129403958044bbae5015e787bcd6fe82bd7650c8..4bd3d03b23edf6c0ba22bda785336ad0a2e54268
--- 1/fs/xfs/linux-2.6/xfs_iops.c
--- 2/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@@ -51,9 -51,9 +51,10 @@@
  #include "xfs_buf_item.h"
  #include "xfs_utils.h"
  
 +#include <linux/capability.h>
  #include <linux/xattr.h>
  #include <linux/namei.h>
+ #include <linux/security.h>
  
  #define IS_NOATIME(inode) ((inode->i_sb->s_flags & MS_NOATIME) ||     \
        (S_ISDIR(inode->i_mode) && inode->i_sb->s_flags & MS_NODIRATIME))

diff --cc fs/xfs/xfs_vnodeops.c
Simple merge