Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 25 Apr 2006 03:08:08 +0000 (20:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 25 Apr 2006 03:08:08 +0000 (20:08 -0700)
commit454ac778459bc70f0a9818a6a8fd974ced11de66
treea1a7d7b6aaca16f48efa14e1d276fd2aeab4d884
parent18118cdbfd1f855e09ee511d764d6c9df3d4f952
parent301dc3e6f6ea83703fa52919c00e60661da5a8fe
Merge /linux/kernel/git/sfrench/cifs-2.6-stable

* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
  [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined