From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 20 Nov 2005 17:19:38 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.15-rc3~138
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=252ec9e28f0cf350e246c065ffe70a2e32b84ad4;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
---

252ec9e28f0cf350e246c065ffe70a2e32b84ad4