Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.37/drivers
authorJens Axboe <jaxboe@fusionio.com>
Sat, 23 Oct 2010 16:43:55 +0000 (18:43 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Sat, 23 Oct 2010 16:43:55 +0000 (18:43 +0200)
commit53c2eb24ff49abe1bfc45d067797f74b409690d8
tree9684ee71d2fda68cde3fd404ba5ffa094fde7351
parent7f3883962870dd28b5f2322ac44a9d03640ef448
parent650789c87f16dcdf1dd0a67ac7461b7537534855
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.37/drivers
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_receiver.c