Linus Torvalds 66b89159c2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs ... * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: [LogFS] Change magic number [LogFS] Remove h_version field [LogFS] Check feature flags [LogFS] Only write journal if dirty [LogFS] Fix bdev erases [LogFS] Silence gcc [LogFS] Prevent 64bit divisions in hash_index [LogFS] Plug memory leak on error paths [LogFS] Add MAINTAINERS entry [LogFS] add new flash file system Fixed up trivial conflict in lib/Kconfig, and a semantic conflict in fs/logfs/inode.c introduced by write_inode() being changed to use writeback_control' by commit a9185b41a4 ("pass writeback_control to ->write_inode")		2010-03-06 13:18:03 -08:00
..
compr.c
dev_bdev.c
dev_mtd.c
dir.c
file.c
gc.c
inode.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs	2010-03-06 13:18:03 -08:00
journal.c
Kconfig
logfs_abi.h
logfs.h
Makefile
readwrite.c
segment.c
super.c