Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6

adn770 · Nov 9, 2012 · 9868365 · 9868365
2 parents ccae786 + 328e0f1
commit 9868365
Show file tree

Hide file tree

Showing 30 changed files with 12,110 additions and 8,623 deletions.
diff --git a/drivers/block/drbd/Makefile b/drivers/block/drbd/Makefile
@@ -1,5 +1,7 @@
 drbd-y := drbd_bitmap.o drbd_proc.o
 drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o
 drbd-y += drbd_main.o drbd_strings.o drbd_nl.o
+drbd-y += drbd_interval.o drbd_state.o
+drbd-y += drbd_nla.o
 
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd.o