Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block into for-2.6.33

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 88241154f4ce69819684d0d991e92a3ec2d1dd75..ab095be9c2dee6ae79b87c150153fe76df5c6ac9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1790,6 +1790,19 @@ S:       Maintained
 F:     drivers/scsi/dpt*
 F:     drivers/scsi/dpt/
 
+DRBD DRIVER
+P:     Philipp Reisner
+P:     Lars Ellenberg
+M:     drbd-dev@lists.linbit.com
+L:     drbd-user@lists.linbit.com
+W:     http://www.drbd.org
+T:     git git://git.drbd.org/linux-2.6-drbd.git drbd
+T:     git git://git.drbd.org/drbd-8.3.git
+S:     Supported
+F:     drivers/block/drbd/
+F:     lib/lru_cache.c
+F:     Documentation/blockdev/drbd/
+
 DRIVER CORE, KOBJECTS, AND SYSFS
 M:     Greg Kroah-Hartman <gregkh@suse.de>
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/