diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /fs/xattr_acl.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/xattr_acl.c')
| -rw-r--r-- | fs/xattr_acl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c index 789a2559bd54..c6ad7c7e3ee9 100644 --- a/fs/xattr_acl.c +++ b/fs/xattr_acl.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/sched.h> | ||
| 10 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 11 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
| 12 | #include <linux/posix_acl_xattr.h> | 11 | #include <linux/posix_acl_xattr.h> |