diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:42:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:42:43 -0700 |
| commit | 3f1ae223902834d81b54b5d333f9efca07ad656b (patch) | |
| tree | dd03e325404fc03692ffd1cd9f4d83ad89584d69 /MAINTAINERS | |
| parent | e2205a156f4dd727097f7f492bf03aa8920b0071 (diff) | |
| parent | 36cbaa8777dd5a79cb56c2a3d7d56f0c80b2bab6 (diff) | |
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] pcwd.c - fix open_allowed type.
[WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation
[WATCHDOG] fix watchdog/wdt285.c compilation
[WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation
[WATCHDOG] fix watchdog/shwdt.c compilation
[WATCHDOG] fix watchdog/txx9wdt.c compilation
[WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry
[WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 41d7a1ed03d..b343814a1ac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4683,12 +4683,6 @@ L: linux-wireless@vger.kernel.org L: zd1211-devs@lists.sourceforge.net (subscribers-only) S: Maintained -ZF MACHZ WATCHDOG -P: Fernando Fuganti -M: fuganti@netbank.com.br -W: http://cvs.conectiva.com.br/drivers/ZFL-watchdog/ -S: Maintained - ZR36067 VIDEO FOR LINUX DRIVER P: Ronald Bultje M: rbultje@ronald.bitfreak.net |