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 a9185b41a4f84971b930c519f0c63bd450c4810d
("pass writeback_control to ->write_inode")
2010-03-06 13:18:03 -08:00
..
2010-02-07 03:06:21 -05:00
2010-01-14 09:05:42 -05:00
2010-02-26 12:15:54 -06:00
2010-01-19 22:36:06 -06:00
2009-07-12 12:22:34 -07:00
2010-02-19 03:35:12 -05:00
2010-01-11 14:30:09 +01:00
2009-12-16 07:20:18 -08:00
2010-01-26 22:22:26 -05:00
2009-12-16 07:20:13 -08:00
2009-12-22 12:27:34 -05:00
2010-03-06 11:26:29 -08:00
2010-03-06 11:26:29 -08:00
2009-09-24 07:21:03 -07:00
2010-03-03 14:13:08 -05:00
2009-12-17 04:52:13 -05:00
2010-03-06 11:26:29 -08:00
2010-03-06 11:26:29 -08:00
2010-03-03 14:07:59 -05:00
2009-11-20 20:13:39 +01:00
2009-12-17 10:51:40 -05:00
2010-03-06 11:26:29 -08:00
2010-03-03 14:08:00 -05:00
2009-12-16 12:16:49 -05:00