Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 19 Jan 2006 03:37:57 +0000 (19:37 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 19 Jan 2006 03:37:57 +0000 (19:37 -0800)
commit0f36b018b2e314d45af86449f1a97facb1fbe300
treeb6a8f59834c3de2ca83e680007b8165de0097d47
parent648bf4fb21f5ce993403901ed82399abaa150b63
parent47c886b3123a335f0622136e021e7691d60d742c
Merge /pub/scm/linux/kernel/git/sfrench/cifs-2.6