Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Sun, 9 Jan 2011 23:18:16 +0000 (23:18 +0000)
committerSteve French <sfrench@us.ibm.com>
Sun, 9 Jan 2011 23:18:16 +0000 (23:18 +0000)
commitacc6f11272ce4f77c40b1a6292eb198fd6aaf8c3
tree2da3a61b6726707a89f1cf93446aabd2fb00e1f0
parent7e12eddb73d4f288b0339ee13832a34d6bc4fd90
parent0c21e3aaf6ae85bee804a325aa29c325209180fd
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:
fs/cifs/dir.c
fs/cifs/cifsfs.c
fs/cifs/dir.c