]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 23:38:58 +0000 (16:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 23:38:58 +0000 (16:38 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] CIFS_DEBUG2 depends on CIFS

1  2 
fs/Kconfig

diff --cc fs/Kconfig
Simple merge