From a5afba16c641dc1dda837cfc32dea1e37666d31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 14 May 2015 13:16:36 +0200 Subject: hwmon: Rename i8k driver to dell-smm-hwmon and move it to hwmon tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit moves i8k driver to hwmon tree under name dell-smm-hwmon which is better name then abbreviation i8k. For backward compatibility is added macro MODULE_ALIAS("i8k") so modprobe will load driver also old name i8k. CONFIG_I8K compile option was not changed. This commit also adds me as maintainer of this new dell-smm-hwmon driver and remove Guenter Roeck from list who is implicit maintainer all hwmon drivers. Signed-off-by: Pali Rohár Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index f8e0afb708b4..9201e140438a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3092,9 +3092,9 @@ S: Maintained F: drivers/platform/x86/dell-smo8800.c DELL LAPTOP SMM DRIVER -M: Guenter Roeck +M: Pali Rohár S: Maintained -F: drivers/char/i8k.c +F: drivers/hwmon/dell-smm-hwmon.c F: include/uapi/linux/i8k.h DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas) -- cgit v1.2.3 From 64dfff038c2a661424cc69e4dfb32cdce74a4be2 Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee Date: Wed, 20 May 2015 20:57:02 +0530 Subject: MAINTAINERS: maintain parport Lets give the parport subsystem a proper name and start maintaining the files. Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 9201e140438a..432e14f25444 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7392,13 +7392,16 @@ S: Maintained F: Documentation/mn10300/ F: arch/mn10300/ -PARALLEL PORT SUPPORT +PARALLEL PORT SUBSYSTEM +M: Sudip Mukherjee +M: Sudip Mukherjee L: linux-parport@lists.infradead.org (subscribers-only) -S: Orphan +S: Maintained F: drivers/parport/ F: include/linux/parport*.h F: drivers/char/ppdev.c F: include/uapi/linux/ppdev.h +F: Documentation/parport*.txt PARAVIRT_OPS INTERFACE M: Jeremy Fitzhardinge -- cgit v1.2.3 From 0e4a566b9e5c7361c31b939649015e13f066fc38 Mon Sep 17 00:00:00 2001 From: Lee Campbell Date: Sun, 24 May 2015 14:47:38 -0700 Subject: MAINTAINERS: Fix typo in Android drivers git path Fix typo in staging git location for the ANDROID DRIVERS secion. Signed-off-by: Lee Campbell Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 432e14f25444..f6ba62c3db82 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -732,7 +732,7 @@ ANDROID DRIVERS M: Greg Kroah-Hartman M: Arve Hjønnevåg M: Riley Andrews -T: git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git L: devel@driverdev.osuosl.org S: Supported F: drivers/android/ -- cgit v1.2.3 From 5069288bd477857fd1894452aa61416f07372060 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Sat, 13 Jun 2015 22:11:33 +0300 Subject: MAINTAINERS: mei: add mei_cl_bus.h to maintained file list mei_cl_bus.h was overlooked when we added the mei bus Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index f6ba62c3db82..c58e2f0612e7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5279,6 +5279,7 @@ M: Tomas Winkler L: linux-kernel@vger.kernel.org S: Supported F: include/uapi/linux/mei.h +F: include/linux/mei_cl_bus.h F: drivers/misc/mei/* F: Documentation/misc-devices/mei/* -- cgit v1.2.3