Merge git://git.kernel.org/pub/scm/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

+1
+1
fs/Kconfig
··· 1801 1801 1802 1802 config CIFS_DEBUG2 1803 1803 bool "Enable additional CIFS debugging routines" 1804 + depends on CIFS 1804 1805 help 1805 1806 Enabling this option adds a few more debugging routines 1806 1807 to the cifs code which slightly increases the size of