rbd: make ceph_parse_options() return a pointer

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8dc270c5ff28b938d7dc129c8f483c32ade1e201..9c63a43ab63a3e892443613daca2f97a36925572 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1721,6 +1721,14 @@ F:       include/linux/can/error.h
 F:     include/linux/can/netlink.h
 F:     include/linux/can/platform/
 
+CAPABILITIES
+M:     Serge Hallyn <serge.hallyn@canonical.com>
+L:     linux-security-module@vger.kernel.org
+S:     Supported       
+F:     include/linux/capability.h
+F:     security/capability.c
+F:     security/commoncap.c 
+
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <arnd@arndb.de>
 L:     linuxppc-dev@lists.ozlabs.org
@@ -2355,6 +2363,15 @@ S:       Supported
 F:     drivers/gpu/drm/exynos
 F:     include/drm/exynos*
 
+EXYNOS MIPI DISPLAY DRIVERS
+M:     Inki Dae <inki.dae@samsung.com>
+M:     Donghwa Lee <dh09.lee@samsung.com>
+M:     Kyungmin Park <kyungmin.park@samsung.com>
+L:     linux-fbdev@vger.kernel.org
+S:     Maintained
+F:     drivers/video/exynos/exynos_mipi*
+F:     include/video/exynos_mipi*
+
 DSCC4 DRIVER
 M:     Francois Romieu <romieu@fr.zoreil.com>
 L:     netdev@vger.kernel.org