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-01-20 17:17:04 -05:00
2006-11-30 04:58:40 +01:00
2005-11-22 09:14:30 -08:00
2009-08-19 10:40:13 -07:00
2006-10-03 22:54:15 +02:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2009-06-06 10:28:14 -06:00
2006-10-03 22:47:42 +02:00
2006-12-30 10:56:45 -08:00
2009-05-19 10:23:23 +01:00
2009-05-19 10:23:23 +01:00
2005-04-16 15:20:36 -07:00
2007-07-31 15:39:38 -07:00
2007-05-09 08:58:15 +02:00
2009-11-20 20:13:39 +01:00
2008-09-02 19:21:37 -07:00
2009-11-13 15:45:01 -08:00
2008-07-26 12:00:05 -07:00
2010-03-06 11:26:26 -08:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-11-30 04:58:40 +01:00
2006-12-07 08:39:44 -08:00
2009-05-21 13:14:32 -07:00
2009-01-29 16:34:30 +02:00
2007-02-12 09:48:40 -08:00
2009-12-10 15:02:50 +01:00
2008-11-12 17:17:17 -08:00