git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into gfs2
[safe/jmp/linux-2.6]
/
fs
/
Kconfig
diff --git
a/fs/Kconfig
b/fs/Kconfig
index
1453d2d
..
fa64867
100644
(file)
--- a/
fs/Kconfig
+++ b/
fs/Kconfig
@@
-325,6
+325,7
@@
config FS_POSIX_ACL
default n
source "fs/xfs/Kconfig"
+source "fs/gfs2/Kconfig"
config OCFS2_FS
tristate "OCFS2 file system support"
@@
-1983,6
+1984,7
@@
endmenu
endif
source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
endmenu