git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[sfrench/cifs-2.6.git]
/
fs
/
Kconfig
diff --git
a/fs/Kconfig
b/fs/Kconfig
index ad63dfd6d76df548881e2a7b2ba52bbe0e091fbc..b6df18f1f677336091a5afdf1b2526c1163914f8 100644
(file)
--- a/
fs/Kconfig
+++ b/
fs/Kconfig
@@
-2124,4
+2124,3
@@
source "fs/nls/Kconfig"
source "fs/dlm/Kconfig"
endmenu
-