From 70aff0ce210f58afa3ed47102532f20834da31b3 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 12 Jul 2010 17:45:49 -0300 Subject: MAINTAINERS: fix EDAC-I7CORE file patterns File patterns are one per line. Fixed include file location. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index a07a49deb47b..58848125b8bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2121,7 +2121,9 @@ M: Mauro Carvalho Chehab L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net S: Maintained -F: drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c +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.2 From 9acf70c1aa1b5a0f8a6a0815c0bc5de2a45e0d71 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 12 Jul 2010 21:18:54 -0700 Subject: MAINTAINERS: Add SBUS driver path to sparc entry. Signed-off-by: David S. Miller --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 6d119c98b89b..1b277665e634 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5317,6 +5317,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git S: Maintained F: arch/sparc/ +F: drivers/sbus SPARC SERIAL DRIVERS M: "David S. Miller" -- cgit v1.2.2 From 230a5cef48158221e3f5ae030fef1cf4512401e1 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Thu, 29 Jul 2010 18:02:51 +0000 Subject: watchdog: update MAINTAINERS entry Add Mailing-list and website to watchdog MAINTAINERS entry. Signed-off-by: Wim Van Sebroeck --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index db3d0f5061f9..02f75fccac20 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6243,6 +6243,8 @@ F: drivers/mmc/host/wbsd.* WATCHDOG DEVICE DRIVERS M: Wim Van Sebroeck +L: linux-watchdog@vger.kernel.org +W: http://www.linux-watchdog.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git S: Maintained F: Documentation/watchdog/ -- cgit v1.2.2