diff --git a/[refs] b/[refs] index e4290469797b..0fcd55130a1f 100644 --- 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 index 286fabf73377..6b3625d3058c 100644 --- 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 index 4e8ace8b9773..7c10c1985272 100644 --- 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 +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 L: linux-mips@linux-mips.org