summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-30 00:21:44 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-30 00:21:44 +0200
commit7d5fcdc38ff0425ff52bffe26d481ea07547574c (patch)
treed4dc2e778ea8672775aa969984f962917e5a03fc
parentMerge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... (diff)
parentwatchdog: update MAINTAINERS entry (diff)
downloadlinux-7d5fcdc38ff0425ff52bffe26d481ea07547574c.tar.xz
linux-7d5fcdc38ff0425ff52bffe26d481ea07547574c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: update MAINTAINERS entry
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
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 <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/