]> git.baikalelectronics.ru Git - kernel.git/commit
[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)
commit9dbe1adcafc390a15ca7ceab1517b03f6fda0b25
treecfc6452bd9d69b6ecd6bf5669d6103d4720765d4
parentbf3c0d8b4f34567035fedc18e35ef3a56b72e6d9
[CIFS] Fix minor merge conflict in fs/cifs/dir.c

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