---

yaml --- r: 304609 b: refs/heads/master c: de8fe02 h: refs/heads/master i: 304607: 2ebfd63 v: v3
git-mirror · May 9, 2012 · fe1b857 · fe1b857
1 parent 63b4d9a
commit fe1b857
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cd7a7e72e929cfe29c247293957848bc6874720
+refs/heads/master: de8fe0233f078e649d7c293218119234606c4546
diff --git a/trunk/Documentation/misc-devices/mei/TODO b/trunk/Documentation/misc-devices/mei/TODO
@@ -1,4 +1,2 @@
 TODO:
 	- Cleanup and split the timer function
-Upon Unstaging:
-	- Updated MAINTAINERS
diff --git a/trunk/MAINTAINERS b/trunk/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