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

..

drbd_actlog.c

…

drbd_bitmap.c

…

drbd_int.h

drbd: Create new current UUID as late as possible

2010-05-18 02:03:49 +02:00

drbd_main.c

drbd: Do not free p_uuid early, this is done in the exit code of the receiver

2010-05-21 21:12:01 +02:00

drbd_nl.c

drivers/block/drbd: Use kzalloc

2010-05-18 02:04:10 +02:00

drbd_proc.c

drbd: Fixes to the new delay_probes code

2010-05-18 01:28:08 +02:00

drbd_receiver.c

drbd: Null pointer deref fix to the large "multi bio rewrite"

2010-05-21 21:12:01 +02:00

drbd_req.c

drbd: If we detect late that IO got frozen, retry after we thawed.

2010-05-18 02:03:32 +02:00

drbd_req.h

…

drbd_strings.c

…

drbd_vli.h

…

drbd_worker.c

Merge branch 'master' into for-2.6.35

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

drbd_wrappers.h

drbd: Allow drbd_epoch_entries to use multiple bios.

2010-05-18 02:01:23 +02:00

Kconfig

…

Makefile

…