From 8b37fcfc9b3400b647748783a2cafff67793e0ad Mon Sep 17 00:00:00 2001 From: Ohad Ben-Cohen Date: Mon, 12 Sep 2011 10:43:01 +0300 Subject: hwspinlock: add MAINTAINERS entries Update MAINTAINERS with entries for hwspinlock/core and hwspinlock/omap files. Signed-off-by: Ohad Ben-Cohen --- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 28f65c249b9..c79a96692d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2953,6 +2953,13 @@ F: Documentation/hw_random.txt F: drivers/char/hw_random/ F: include/linux/hw_random.h +HARDWARE SPINLOCK CORE +M: Ohad Ben-Cohen +S: Maintained +F: Documentation/hwspinlock.txt +F: drivers/hwspinlock/hwspinlock_* +F: include/linux/hwspinlock.h + HARMONY SOUND DRIVER M: Kyle McMartin L: linux-parisc@vger.kernel.org @@ -4625,6 +4632,13 @@ S: Maintained F: drivers/video/omap2/ F: Documentation/arm/OMAP/DSS +OMAP HARDWARE SPINLOCK SUPPORT +M: Ohad Ben-Cohen +L: linux-omap@vger.kernel.org +S: Maintained +F: drivers/hwspinlock/omap_hwspinlock.c +F: arch/arm/mach-omap2/hwspinlock.c + OMAP MMC SUPPORT M: Jarkko Lavinen L: linux-omap@vger.kernel.org -- cgit v1.2.3-70-g09d2 From 6b1c70b1ff6f800f081a6bbef662789135f7b398 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Tue, 11 Oct 2011 15:40:38 -0700 Subject: MAINTAINERS: Update entry for IA64 Dropped the "-2.6" from the git tree name. Website link is no longer useful. Signed-off-by: Tony Luck --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 51d42fbc8dc..ef6fa0b0e44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3144,8 +3144,7 @@ IA64 (Itanium) PLATFORM M: Tony Luck M: Fenghua Yu L: linux-ia64@vger.kernel.org -W: http://www.ia64-linux.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git S: Maintained F: arch/ia64/ -- cgit v1.2.3-70-g09d2 From 23cc94eaea4436d37c0b7f1f264a319e8f11088f Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 10 Oct 2011 19:37:44 +0200 Subject: udf: Remove web reference from UDF MAINTAINERS entry Web link in UDF MAINTAINERS entry doesn't work and I don't use SF for UDF development (and don't see a point to start using it). So just remove the link. Reported-by: Joe Perches Signed-off-by: Jan Kara --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1d445f57298..e011970ba22 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6572,7 +6572,6 @@ F: drivers/net/ne-h8300.c UDF FILESYSTEM M: Jan Kara -W: http://linux-udf.sourceforge.net S: Maintained F: Documentation/filesystems/udf.txt F: fs/udf/ -- cgit v1.2.3-70-g09d2 From 0e05e192c0ff706ee2a12eb65074085e3967d862 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 1 Nov 2011 09:44:56 +0100 Subject: MAINTAINERS: update netfilter maintainers Marc Boucher, James Morris and Rusty Russell were crucial in the early netfilter days. We thank them all! However, they are not actively maintaining netfilter anymore. This patch adds myself as netfilter maintainer. Signed-off-by: Pablo Neira Ayuso --- MAINTAINERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 4befa126852..8edf72bba65 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4452,11 +4452,9 @@ F: Documentation/networking/vxge.txt F: drivers/net/ethernet/neterion/ NETFILTER/IPTABLES/IPCHAINS -P: Rusty Russell -P: Marc Boucher -P: James Morris P: Harald Welte P: Jozsef Kadlecsik +M: Pablo Neira Ayuso M: Patrick McHardy L: netfilter-devel@vger.kernel.org L: netfilter@vger.kernel.org -- cgit v1.2.3-70-g09d2 From 45f74482a05df8aa9253ec0b228648cbad3dd7e8 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 1 Nov 2011 10:00:17 -0200 Subject: MAINTAINERS: remove dropped edac_mce.* from the file Signed-off-by: Mauro Carvalho Chehab --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 6185d051358..1544cc8cf2d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2409,8 +2409,6 @@ L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i7core_edac.c -F: drivers/edac/edac_mce.c -F: include/linux/edac_mce.h EDAC-I82975X M: Ranganathan Desikan -- cgit v1.2.3-70-g09d2 From 4d096ca7e65584dd5845e64c6400f920e694f672 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 1 Nov 2011 10:03:24 -0200 Subject: MAINTAINERS: add an entry for Edac Sandy Bridge driver Signed-off-by: Mauro Carvalho Chehab --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 1544cc8cf2d..14070ab3fc6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2432,6 +2432,13 @@ W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/r82600_edac.c +EDAC-SBRIDGE +M: Mauro Carvalho Chehab +L: linux-edac@vger.kernel.org +W: bluesmoke.sourceforge.net +S: Maintained +F: drivers/edac/sb_edac.c + EDIROL UA-101/UA-1000 DRIVER M: Clemens Ladisch L: alsa-devel@alsa-project.org (moderated for non-subscribers) -- cgit v1.2.3-70-g09d2 From c49b82da1f6649b76acbabc7940ddb53a00bdfcc Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Wed, 2 Nov 2011 10:55:13 +0000 Subject: MAINTAINERS: Add can-gw include to maintained files Commit c1aabdf379bc2feeb0df7057ed5bad96f492133e (can-gw: add netlink based CAN routing) added a new include file that's neither referenced by any of the CAN maintainers. Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 8edf72bba65..a618408917b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1703,6 +1703,7 @@ F: include/linux/can.h F: include/linux/can/core.h F: include/linux/can/bcm.h F: include/linux/can/raw.h +F: include/linux/can/gw.h CAN NETWORK DRIVERS M: Wolfgang Grandegger -- cgit v1.2.3-70-g09d2 From 0de9adf284ec20454ecf37ffd98e7e98ba7292d6 Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Sat, 5 Nov 2011 09:04:47 -0400 Subject: MAINTAINERS: Update eCryptfs maintainer address Update my email address in MAINTAINERS. Signed-off-by: Tyler Hicks Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index a6afe342f0f..6388a96dc1c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2387,7 +2387,7 @@ F: include/linux/netfilter_bridge/ebt_*.h F: net/bridge/netfilter/ebt*.c ECRYPT FILE SYSTEM -M: Tyler Hicks +M: Tyler Hicks M: Dustin Kirkland L: ecryptfs@vger.kernel.org W: https://launchpad.net/ecryptfs -- cgit v1.2.3-70-g09d2