Theodore Ts'o a107e5a3a4 Merge branch 'next' into upstream-merge ...

Conflicts:
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	include/trace/events/ext4.h

2010-10-27 23:44:47 -04:00

..

checkpoint.c

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

commit.c

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

journal.c

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

Kconfig

Revert "task_struct: make journal_info conditional"

2009-12-17 13:23:24 -08:00

Makefile

…

recovery.c

ext4: remove initialized but not read variables

2010-06-14 13:28:03 -04:00

revoke.c

remove SWRITE* I/O types

2010-08-18 01:09:01 -04:00

transaction.c

jbd2: Add sanity check for attempts to start handle during umount

2010-10-27 21:30:04 -04:00