From: Steve French <sfrench@us.ibm.com>
Date: Sun, 9 Jan 2011 23:26:56 +0000 (+0000)
Subject: [CIFS] Fix minor merge conflict in fs/cifs/dir.c
X-Git-Tag: v2.6.38-rc1~446^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=197a1eeb7f89c1d2ba93713398e9655899aa973e;p=pandora-kernel.git

[CIFS] Fix minor merge conflict in fs/cifs/dir.c

Signed-off-by: Steve French <sfrench@us.ibm.com>
---

Reading git-diff-tree failed