]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18118cd 301dc3e)
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)
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
  [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined


Trivial merge
Linux 2.6 source tree