[CIFS] Fix minor merge conflict in fs/cifs/dir.c
authorSteve French <sfrench@us.ibm.com>
Sun, 9 Jan 2011 23:26:56 +0000 (23:26 +0000)
committerSteve French <sfrench@us.ibm.com>
Sun, 9 Jan 2011 23:26:56 +0000 (23:26 +0000)
commit197a1eeb7f89c1d2ba93713398e9655899aa973e
treecfc6452bd9d69b6ecd6bf5669d6103d4720765d4
parentacc6f11272ce4f77c40b1a6292eb198fd6aaf8c3
[CIFS] Fix minor merge conflict in fs/cifs/dir.c

Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/dir.c