From 03e7c251533bf45913a73a9cd8f79adc5efe1c30 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Thu, 26 Apr 2012 13:46:42 +0200 Subject: MAINTAINERS: Add new Industrial I/O subsystem location Add the new out-of-staging IIO directory to the IIO MAINTAINERS file entry. Signed-off-by: Lars-Peter Clausen Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 2dcfca85063..48930265e69 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3384,6 +3384,7 @@ IIO SUBSYSTEM AND DRIVERS M: Jonathan Cameron L: linux-iio@vger.kernel.org S: Maintained +F: drivers/iio/ F: drivers/staging/iio/ IKANOS/ADI EAGLE ADSL USB DRIVER -- cgit v1.2.3-70-g09d2 From 390beae4f843d4d2c4adfdedc1e3d633f9d3945f Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Thu, 3 May 2012 17:52:36 +0100 Subject: MAINTAINERS: Add maintainers for VME subsystem Add Martyn Welch, Manohar Vanga and Greg Kroah-Hartman as maintainers for the VME subsystem. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 216dbf3febb..4e8ace8b977 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7313,6 +7313,18 @@ S: Maintained F: drivers/vlynq/vlynq.c F: include/linux/vlynq.h +VME SUBSYSTEM +M: Martyn Welch +M: Manohar Vanga +M: Greg Kroah-Hartman +L: devel@driverdev.osuosl.org +S: Maintained +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +F: Documentation/vme_api.txt +F: drivers/staging/vme/ +F: drivers/vme/ +F: include/linux/vme* + VMWARE VMXNET3 ETHERNET DRIVER M: Shreyas Bhatewara M: "VMware, Inc." -- cgit v1.2.3-70-g09d2 From de8fe0233f078e649d7c293218119234606c4546 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 9 May 2012 16:39:02 +0300 Subject: mei: update MAINTAINERS file Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- Documentation/misc-devices/mei/TODO | 2 -- MAINTAINERS | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') 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 @@ TODO: - Cleanup and split the timer function -Upon Unstaging: - - Updated MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS index 4e8ace8b977..7c10c198527 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 +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 -- cgit v1.2.3-70-g09d2