Theodore Ts'o ff9cb1c4ee Merge branch 'for_linus' into for_linus_merged ...

Conflicts:
	fs/ext4/ioctl.c

2012-01-10 11:54:07 -05:00

..

checkpoint.c

treewide: Fix comment and string typo 'bufer'

2011-12-06 09:53:40 +01:00

commit.c

jbd2: clear revoked flag on buffers before a new transaction started

2011-12-28 17:46:46 -05:00

journal.c

freezer: unexport refrigerator() and update try_to_freeze() slightly

2011-11-21 12:32:22 -08:00

Kconfig

Revert "task_struct: make journal_info conditional"

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

Makefile

…

recovery.c

jbd2: Unify log messages in jbd2 code

2011-11-01 19:09:18 -04:00

revoke.c

jbd2: clear revoked flag on buffers before a new transaction started

2011-12-28 17:46:46 -05:00

transaction.c

jbd2: fix hung processes in jbd2_journal_lock_updates()

2012-01-04 22:03:11 -05:00