Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 04:15:57 +0000 (20:15 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 04:15:57 +0000 (20:15 -0800)
commit8aeba3c62a64e0f6527d1a0388b1a6a7060158ba
tree8ed24e13468c348ed69d866ca8433bd2f3ccdce6
parent61ee9cd5f2e76859222c1d64394ae633f9080163
parente6da74e1f20ea7822e52a9e4fbd3d25bd907e471
Merge /pub/scm/linux/kernel/git/sfrench/cifs-2.6