Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Sun, 21 Aug 2005 04:40:00 +0000 (21:40 -0700)
committerSteve French <sfrench@us.ibm.com>
Sun, 21 Aug 2005 04:40:00 +0000 (21:40 -0700)
commit646352319b6cd369750a706706810d87f6b6efa7
treee7830e1276cbad7d29bf9471def4b8940592c3b7
parentd3485d37c0b3292aec0618b6663c57542df5da99
parentf6fdd7d9c273bb2a20ab467cb57067494f932fa3
Merge ... /linux/kernel/git/torvalds/linux-2.6.git
fs/cifs/cifsfs.h
fs/cifs/link.c