Merge branch 'for-next'
authorSteve French <sfrench@us.ibm.com>
Fri, 8 Oct 2010 03:42:03 +0000 (03:42 +0000)
committerSteve French <sfrench@us.ibm.com>
Fri, 8 Oct 2010 03:42:03 +0000 (03:42 +0000)
1  2 
fs/cifs/cifssmb.c
fs/cifs/inode.c

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