Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

author Steve French <sfrench@us.ibm.com>

Fri, 15 Feb 2008 21:06:08 +0000 (21:06 +0000)

committer Steve French <sfrench@us.ibm.com>

Fri, 15 Feb 2008 21:06:08 +0000 (21:06 +0000)
author Steve French <sfrench@us.ibm.com>
Fri, 15 Feb 2008 21:06:08 +0000 (21:06 +0000)
committer Steve French <sfrench@us.ibm.com>
Fri, 15 Feb 2008 21:06:08 +0000 (21:06 +0000)
diff --cc fs/cifs/cifs_dfs_ref.c
Simple merge
diff --cc fs/cifs/cifsfs.c
Simple merge
diff --cc fs/cifs/inode.c
Simple merge
author	Steve French <sfrench@us.ibm.com>
	Fri, 15 Feb 2008 21:06:08 +0000 (21:06 +0000)
committer	Steve French <sfrench@us.ibm.com>
	Fri, 15 Feb 2008 21:06:08 +0000 (21:06 +0000)
		1	2
fs/cifs/cifs_dfs_ref.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history