diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /mm/shmem_acl.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'mm/shmem_acl.c')
| -rw-r--r-- | mm/shmem_acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/shmem_acl.c b/mm/shmem_acl.c index c946bf468718..f5664c5b9eb1 100644 --- a/mm/shmem_acl.c +++ b/mm/shmem_acl.c | |||
| @@ -35,7 +35,7 @@ shmem_get_acl(struct inode *inode, int type) | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * shmem_get_acl - generic_acl_operations->setacl() operation | 38 | * shmem_set_acl - generic_acl_operations->setacl() operation |
| 39 | */ | 39 | */ |
| 40 | static void | 40 | static void |
| 41 | shmem_set_acl(struct inode *inode, int type, struct posix_acl *acl) | 41 | shmem_set_acl(struct inode *inode, int type, struct posix_acl *acl) |