aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-05-09 09:39:02 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-09 17:00:31 -0400
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 286fabf7337..6b3625d3058 100644
--- a/Documentation/misc-devices/mei/TODO
+++ b/Documentation/misc-devices/mei/TODO
@@ -1,4 +1,2 @@
1TODO: 1TODO:
2 - Cleanup and split the timer function 2 - Cleanup and split the timer function
3Upon Unstaging:
4 - Updated MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e8ace8b977..7c10c198527 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3610,6 +3610,14 @@ S: Supported
3610W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi 3610W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
3611F: drivers/net/wireless/iwmc3200wifi/ 3611F: drivers/net/wireless/iwmc3200wifi/
3612 3612
3613INTEL MANAGEMENT ENGINE (mei)
3614M: Tomas Winkler <tomas.winkler@intel.com>
3615L: linux-kernel@vger.kernel.org
3616S: Supported
3617F: include/linux/mei.h
3618F: drivers/misc/mei/*
3619F: Documentation/mei/*
3620
3613IOC3 ETHERNET DRIVER 3621IOC3 ETHERNET DRIVER
3614M: Ralf Baechle <ralf@linux-mips.org> 3622M: Ralf Baechle <ralf@linux-mips.org>
3615L: linux-mips@linux-mips.org 3623L: linux-mips@linux-mips.org