Merge v3.13-rc6 into char-misc-next

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d5e4ff328cc7146827ac3d02cd8df189b881abc4..0a1475b6b35867e1d8de366624a7751d5252062d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2616,7 +2616,7 @@ S:        Maintained
 F:     drivers/platform/x86/dell-laptop.c
 
 DELL LAPTOP SMM DRIVER
-S:     Orphan
+M:     Guenter Roeck <linux@roeck-us.net>
 F:     drivers/char/i8k.c
 F:     include/uapi/linux/i8k.h