]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3cbd09667458b6cb8ffd81d197180d4d89be86f8
tree75c828a7c8a9f1b5f7f41b2e53271eafb7e561ef
parenta4f58c8d89db6d7f509426554caaa386530951c9
parentc983124d6a104d77fac2348e30cdca9ee418b3a6
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

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