Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[safe/jmp/linux-2.6] / Documentation / ecryptfs.txt
2006-10-04 Michael Halcrow[PATCH] ecryptfs: fs/Makefile and fs/Kconfig