Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit252ec9e28f0cf350e246c065ffe70a2e32b84ad4
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 20 Nov 2005 17:19:38 +0000 (20 09:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 20 Nov 2005 17:19:38 +0000 (20 09:19 -0800)
treed282a3293c9547da95c4e145175bd86741f5d5f4
parentd4892279d786dd11f9d6269b3029ad3340e79597
parent1e6b39fbb61800e3ecee58dc8c4bca57c89365cd
Merge /pub/scm/linux/kernel/git/sfrench/cifs-2.6