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	[LogFS] add new flash file system	2009-11-20 20:13:39 +01:00
dev_bdev.c	[LogFS] Fix bdev erases	2010-03-04 21:30:58 +01:00
dev_mtd.c	[LogFS] Fix bdev erases	2010-03-04 21:30:58 +01:00
dir.c	[LogFS] Prevent 64bit divisions in hash_index	2009-11-28 13:14:08 +01:00
file.c	[LogFS] add new flash file system	2009-11-20 20:13:39 +01:00
gc.c	[LogFS] Only write journal if dirty	2010-03-04 21:36:19 +01:00
inode.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs	2010-03-06 13:18:03 -08:00
journal.c	[LogFS] Remove h_version field	2010-03-06 10:01:46 +01:00
Kconfig	[LogFS] add new flash file system	2009-11-20 20:13:39 +01:00
logfs_abi.h	[LogFS] Change magic number	2010-03-06 10:03:11 +01:00
logfs.h	[LogFS] Only write journal if dirty	2010-03-04 21:36:19 +01:00
Makefile	[LogFS] add new flash file system	2009-11-20 20:13:39 +01:00
readwrite.c	[LogFS] Only write journal if dirty	2010-03-04 21:36:19 +01:00
segment.c	[LogFS] Only write journal if dirty	2010-03-04 21:36:19 +01:00
super.c	[LogFS] Check feature flags	2010-03-05 16:07:04 +01:00