summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-08-04 11:56:17 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-08-04 11:56:17 +0900
commit701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb (patch)
treec07aa954f48ec45c422641052d46008697a4a6b1 /MAINTAINERS
parent285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (diff)
parent3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff)
downloadkernel-701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig arch/arm/configs/g4evm_defconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d6f71284ac16..04c955be3ee8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2122,7 +2122,9 @@ M: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <ravi@jetztechnologies.com>
@@ -5335,6 +5337,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" <davem@davemloft.net>
@@ -6241,6 +6244,8 @@ F: drivers/mmc/host/wbsd.*
WATCHDOG DEVICE DRIVERS
M: Wim Van Sebroeck <wim@iguana.be>
+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/