fs: merge xattr_acl.c into posix_acl.c

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --cc fs/Makefile
Simple merge

diff --cc fs/posix_acl.c
Simple merge

diff --cc fs/xattr_acl.c
Simple merge