diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
tree | 38c60215646d079fab3bff812e094e914960c7ec /fs/xfs/xfs_acl.h | |
parent | cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff) | |
parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
download | op-kernel-dev-673f8205914a12e928c65afbcd78ae748f78df53.zip op-kernel-dev-673f8205914a12e928c65afbcd78ae748f78df53.tar.gz |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
Diffstat (limited to 'fs/xfs/xfs_acl.h')
-rw-r--r-- | fs/xfs/xfs_acl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h index a4e293b..642f1db 100644 --- a/fs/xfs/xfs_acl.h +++ b/fs/xfs/xfs_acl.h @@ -22,7 +22,6 @@ * Access Control Lists */ typedef __uint16_t xfs_acl_perm_t; -typedef __int32_t xfs_acl_type_t; typedef __int32_t xfs_acl_tag_t; typedef __int32_t xfs_acl_id_t; |