Jens Axboe b4b7a4ef09 Merge branch 'master' into for-linus ... Conflicts: block/Kconfig Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2010-03-19 08:05:10 +01:00
..
drbd_actlog.c	drbd: fix al-to-on-disk-bitmap for 4k logical_block_size	2010-03-11 16:33:46 +01:00
drbd_bitmap.c	block: drbd: Convert semaphore to mutex	2010-03-11 13:30:16 +01:00
drbd_int.h	Merge branch 'master' into for-linus	2010-03-19 08:05:10 +01:00
drbd_main.c	drbd_disconnect: grab meta.socket mutex as well	2010-03-11 16:02:45 +01:00
drbd_nl.c	drbd: Renamed overwrite_peer to primary_force	2010-03-11 16:32:14 +01:00
drbd_proc.c	drbd: Constify struct file_operations	2009-12-21 12:45:15 +01:00
drbd_receiver.c	drbd: Reduce the time an empty resync takes usually	2010-03-11 16:09:03 +01:00
drbd_req.c	drbd_req.c: use part_[inc|dec]_in_flight()	2009-12-03 17:40:51 +01:00
drbd_req.h	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
drbd_strings.c
drbd_vli.h
drbd_worker.c	drbd: Make sure we do not send state updates during an empty resync [Bugz 271]	2010-03-11 16:10:40 +01:00
drbd_wrappers.h
Kconfig	drbd: Kconfig fix	2009-12-29 17:38:28 +01:00
Makefile	drbd: remove tracing bits	2009-10-01 21:17:58 +02:00