tree 2da3a61b6726707a89f1cf93446aabd2fb00e1f0
parent 7e12eddb73d4f288b0339ee13832a34d6bc4fd90
parent 0c21e3aaf6ae85bee804a325aa29c325209180fd
author Steve French <sfrench@us.ibm.com> 1294615096 +0000
committer Steve French <sfrench@us.ibm.com> 1294615096 +0000

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

Conflicts:
	fs/cifs/dir.c