[zfs-linux/lzfs] 564f4a: Merge branch 'master' of git@github.com:zfs-linux/...

[nor...@github.com]

Branch: refs/heads/master
Home: https://github.com/zfs-linux/lzfs

Commit: 564f4a82bde0dd1832a1eb6e7cbc28ec08f4c621
https://github.com/zfs-linux/lzfs/commit/564f4a82bde0dd1832a1eb6e7cbc28ec08f4c621
Author: tushar <tus...@kqinfotech.com>
Date: 2011-02-16 (Wed, 16 Feb 2011)

Changed paths:
M include/lzfs_xattr.h
M module/Makefile.in
M module/lzfs_super.c
M module/lzfs_vnops.c
M module/lzfs_xattr.c
A module/lzfs_xattr_acl.c
M module/lzfs_xattr_security.c
M module/lzfs_xattr_user.c

Log Message:
-----------
Merge branch 'master' of g...@github.com:zfs-linux/lzfs into debian

Conflicts:

module/lzfs_vnops.c
module/lzfs_xattr.c
module/lzfs_xattr_security.c
module/lzfs_xattr_user.c