[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)
Signed-off-by: Steve French <sfrench@us.ibm.com>

No differences found