projects/linux·commit 7d5fcdc3

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

7d5fcdc3 · Linus Torvalds <[email protected]> · 2010-07-29 15:21:44 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: update MAINTAINERS entry
Commit
7d5fcdc38ff0425ff52bffe26d481ea07547574c
Parents
e271e872 · 230a5cef

Merge commit. Changes below are compared with the first parent: e271e872.

Changes

1 files changed · +2 −0

FileStatusAddDelContent
MAINTAINERSmodified+2−0View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index db3d0f5..02f75fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6243,6 +6243,8 @@ F: drivers/mmc/host/wbsd.*
WATCHDOG DEVICE DRIVERS
M: Wim Van Sebroeck <[email protected]>
+L: [email protected]
+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/