]> err.no Git - linux-2.6/commitdiff
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)
1  2 
fs/cifs/cifsfs.h
fs/cifs/link.c

Simple merge
diff --cc fs/cifs/link.c
Simple merge