Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core

irqchip core changes for v3.18

 - renesas: suspend to RAM, runtime PM, cleanups and DT binding docs
 - keystone: add new driver
 - hip04: add Hisilicon HiP04 driver (without touching irq-gic.c)
 - gic: Use defines instead of magic number, preserve v2 bybass bits
 - handle_domain_irq: common low level interrupt entry handler

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 3dbe9bd57a09..debb70d40547 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -52,7 +52,7 @@
 #endif
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.4.3"
+#define REL_VERSION "8.4.5"
 #define API_VERSION 1
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 101
@@ -245,7 +245,7 @@ enum drbd_disk_state {
         D_DISKLESS,
         D_ATTACHING,      /* In the process of reading the meta-data */
         D_FAILED,         /* Becomes D_DISKLESS as soon as we told it the peer */
-                        /* when >= D_FAILED it is legal to access mdev->bc */
+                          /* when >= D_FAILED it is legal to access mdev->ldev */
         D_NEGOTIATING,    /* Late attaching state, we need to talk to the peer */
         D_INCONSISTENT,
         D_OUTDATED,