summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-05-09 16:39:02 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-09 14:00:31 -0700
commitde8fe0233f078e649d7c293218119234606c4546 (patch)
tree4f55faf7dd1cd54088399004341e3a19ef8672f1
parent4cd7a7e72e929cfe29c247293957848bc6874720 (diff)
mei: update MAINTAINERS file
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--Documentation/misc-devices/mei/TODO2
-rw-r--r--MAINTAINERS8
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/misc-devices/mei/TODO b/Documentation/misc-devices/mei/TODO
index 286fabf73377..6b3625d3058c 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 4e8ace8b9773..7c10c1985272 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