diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 16:18:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 16:18:03 -0500 |
commit | 66b89159c25a47d2177743526c61b5ada7acc39e (patch) | |
tree | b092b859ca01d7544a666c95f940144b0ef3b35b /MAINTAINERS | |
parent | 87c7ae06cc50bcbcdcc60d64a959ca0b9b71f892 (diff) | |
parent | c2f843f03d658e9ab2a1a455f2c1851fd6a869af (diff) |
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")
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bfa4fd1f3c03..c8a8b1fd58b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3450,6 +3450,13 @@ S: Maintained | |||
3450 | F: Documentation/ldm.txt | 3450 | F: Documentation/ldm.txt |
3451 | F: fs/partitions/ldm.* | 3451 | F: fs/partitions/ldm.* |
3452 | 3452 | ||
3453 | LogFS | ||
3454 | M: Joern Engel <joern@logfs.org> | ||
3455 | L: logfs@logfs.org | ||
3456 | W: logfs.org | ||
3457 | S: Maintained | ||
3458 | F: fs/logfs/ | ||
3459 | |||
3453 | LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) | 3460 | LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) |
3454 | M: Eric Moore <Eric.Moore@lsi.com> | 3461 | M: Eric Moore <Eric.Moore@lsi.com> |
3455 | M: support@lsi.com | 3462 | M: support@lsi.com |