From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Jan 2006 17:10:34 +0000 (-0800)
Subject: Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
X-Git-Tag: v2.6.16-rc1~185
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=9f5974c8734d83d4ab7096ed98136a82f41210d6;p=powerpc.git

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

9f5974c8734d83d4ab7096ed98136a82f41210d6
diff --cc fs/xfs/linux-2.6/xfs_iops.c
index 9b8ee3470e,1294039580..4bd3d03b23
--- a/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))