Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Thu, 13 May 2010 22:19:32 +0000 (22:19 +0000)
committerSteve French <sfrench@us.ibm.com>
Thu, 13 May 2010 22:19:32 +0000 (22:19 +0000)
commitbaa456331738b4e76a92318b62b354377a30ad80
tree75c828a7c8a9f1b5f7f41b2e53271eafb7e561ef
parentaa3e5572c538d753dce11bf93532a75f95d22b40
parent4462dc02842698f173f518c1f5ce79c0fb89395a
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:
fs/cifs/inode.c
fs/cifs/cifsfs.c
fs/cifs/cifsglob.h
fs/cifs/inode.c