Jens Axboe ee9a3607fb Merge branch 'master' into for-2.6.35 ...

Conflicts:
	fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2010-05-21 21:27:26 +02:00

..

checkpoint.c

blkdev: generalize flags for blkdev_issue_fn functions

2010-04-28 19:47:36 +02:00

commit.c

blkdev: generalize flags for blkdev_issue_fn functions

2010-04-28 19:47:36 +02:00

journal.c

jbd2: use NULL instead of 0 when pointer is needed

2010-05-11 10:04:36 +02:00

Kconfig

Revert "task_struct: make journal_info conditional"

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

Makefile

…

recovery.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

revoke.c

jbd2: use SWRITE_SYNC_PLUG when writing synchronous revoke records

2009-04-14 07:50:56 -04:00

transaction.c

jbd2: delay discarding buffers in journal_unmap_buffer

2010-02-15 16:35:42 -05:00