Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> --- Documentation/misc-devices/mei/TODO | 2 -- MAINTAINERS | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) 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@xxxxxxxxx> +L: linux-kernel@xxxxxxxxxxxxxxx +S: Supported +F: include/linux/mei.h +F: drivers/misc/mei/* +F: Documentation/mei/* + IOC3 ETHERNET DRIVER M: Ralf Baechle <ralf@xxxxxxxxxxxxxx> L: linux-mips@xxxxxxxxxxxxxx -- 1.7.4.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
