switch shmem to inode->i_acl
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 8 Jun 2009 23:56:00 +0000 (19:56 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 24 Jun 2009 12:17:06 +0000 (08:17 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
include/linux/shmem_fs.h
mm/shmem.c
mm/shmem_acl.c

Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/shmem_acl.c
Simple merge