From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 9 May 2012 13:39:02 +0000 (+0300)
Subject: mei: update MAINTAINERS file
X-Git-Tag: accepted/tizen/common/20141203.182822~4586^2~162
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de8fe0233f078e649d7c293218119234606c4546;p=platform%2Fkernel%2Flinux-arm64.git

mei: update MAINTAINERS file

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/Documentation/misc-devices/mei/TODO b/Documentation/misc-devices/mei/TODO
index 286fabf..6b3625d 100644
--- a/Documentation/misc-devices/mei/TODO
+++ b/Documentation/misc-devices/mei/TODO
@@ -1,4 +1,2 @@
 TODO:
 	- Cleanup and split the timer function
-Upon Unstaging:
-	- Updated MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e8ace8..7c10c19 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3610,6 +3610,14 @@ S:	Supported
 W:	http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
 F:	drivers/net/wireless/iwmc3200wifi/
 
+INTEL MANAGEMENT ENGINE (mei)
+M:	Tomas Winkler <tomas.winkler@intel.com>
+L:	linux-kernel@vger.kernel.org
+S:	Supported
+F:	include/linux/mei.h
+F:	drivers/misc/mei/*
+F:	Documentation/mei/*
+
 IOC3 ETHERNET DRIVER
 M:	Ralf Baechle <ralf@linux-mips.org>
 L:	linux-mips@linux-mips.org