Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit0d10e47f9635ecafe5a9dc6e10cb056a87a4daa2
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 23:38:58 +0000 (13 16:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 23:38:58 +0000 (13 16:38 -0700)
tree5a9f4f813bda6aeb32715fa8f5d3dc8172605795
parent300c215acd2462223a6595d3562dad67d0e10afd
parent8ba10ab128e88bfbe58f7164543827ef3c3a2c88
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] CIFS_DEBUG2 depends on CIFS
fs/Kconfig