diff options
| author | Patrick McHardy <kaber@trash.net> | 2012-08-08 21:03:47 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2012-08-08 21:03:47 +0200 |
| commit | d53b4ed072d9779cdf53582c46436dec06d0961f (patch) | |
| tree | ac95ecab33e31cd79aae69c475e8348adac51230 /fs/nfs/nfs3acl.c | |
| parent | 5d4dff7f1011a81a693a9c7b1f6a0b9c842eb60c (diff) | |
| parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) | |
Merge tag 'v3.5' of 192.168.0.154:/repos/git/linux-2.6
Conflicts:
drivers/Kconfig
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'fs/nfs/nfs3acl.c')
| -rw-r--r-- | fs/nfs/nfs3acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c index 7ef23979896..e4498dc351a 100644 --- a/fs/nfs/nfs3acl.c +++ b/fs/nfs/nfs3acl.c @@ -192,7 +192,7 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type) .pages = pages, }; struct nfs3_getaclres res = { - 0 + NULL, }; struct rpc_message msg = { .rpc_argp = &args, |