Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Thu, 19 Jan 2006 03:37:57 +0000 (19:37 -0800)]

Trivial merge