diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:29:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:31:54 -0400 |
| commit | 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 (patch) | |
| tree | a1a8cc85948c086aa12a1d8014151a7ca7c04ea8 /MAINTAINERS | |
| parent | 9fc3af467d0749989518a23f7289a6f44e5cb214 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c
Merge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b7f6a88ce129..5d5f9e2617fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6236,6 +6236,8 @@ F: drivers/mmc/host/wbsd.* | |||
| 6236 | 6236 | ||
| 6237 | WATCHDOG DEVICE DRIVERS | 6237 | WATCHDOG DEVICE DRIVERS |
| 6238 | M: Wim Van Sebroeck <wim@iguana.be> | 6238 | M: Wim Van Sebroeck <wim@iguana.be> |
| 6239 | L: linux-watchdog@vger.kernel.org | ||
| 6240 | W: http://www.linux-watchdog.org/ | ||
| 6239 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git | 6241 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git |
| 6240 | S: Maintained | 6242 | S: Maintained |
| 6241 | F: Documentation/watchdog/ | 6243 | F: Documentation/watchdog/ |