Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6
authorPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:18:43 +0000 (14:18 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:20:23 +0000 (14:20 +0100)
commit986836503e49ccf7e84b813715d344964ec93566
treeb3bea7428efde5b77096cef80e5b6bfee494cc12
parentccae7868b0c5697508a541c531cf96b361d62c1c
parent328e0f125bf41f4f33f684db22015f92cb44fe56
Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6
drivers/block/drbd/drbd_bitmap.c
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_interval.c
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_nl.c
drivers/block/drbd/drbd_receiver.c
drivers/block/drbd/drbd_req.c
include/linux/idr.h