diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 23:43:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 23:43:52 -0400 |
commit | 2f63251ed0a803ddbe7bf2577b69d467aa872f68 (patch) | |
tree | 960ba4e27bb2cffdda0841ee701515c4bd75143a /MAINTAINERS | |
parent | d6dd9e93c7531fa31370e27d053a3940d8d662fb (diff) | |
parent | 647e50f38345525d8261c295a0d0629dcea23a9b (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: (28 commits)
[WATCHDOG] Fix pcwd_init_module crash
[WATCHDOG] ICH9 support for iTCO_wdt
[WATCHDOG] 631xESB/632xESB support for iTCO_wdt - add all LPC bridges
[WATCHDOG] 631xESB/632xESB support for iTCO_wdt
[WATCHDOG] omap_wdt.c - default error for IOCTL is -ENOTTY
[WATCHDOG] Return value of nonseekable_open
[WATCHDOG] mv64x60_wdt: Rework the timeout register manipulation
[WATCHDOG] mv64x60_wdt: disable watchdog timer when driver is probed
[WATCHDOG] mv64x60_wdt: Support the WDIOF_MAGICCLOSE feature
[WATCHDOG] mv64x60_wdt: Add a module parameter to change nowayout setting
[WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
[WATCHDOG] mv64x60_wdt: Support for WDIOC_SETTIMEOUT ioctl
[WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
[WATCHDOG] mv64x60_wdt: Check return value of nonseekable_open
[WATCHDOG] mv64x60_wdt: Add arch/powerpc platform support
[WATCHDOG] mv64x60_wdt: Get register address from platform data
[WATCHDOG] mv64x60_wdt: set up platform_device in platform code
[WATCHDOG] ensure mouse and keyboard ignored in w83627hf_wdt
[WATCHDOG] s3c2410_wdt: fixup after arch include moves
[WATCHDOG] git-watchdog-typo
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c29289760741..1e15a0edc313 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -756,6 +756,14 @@ L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | |||
756 | W: http://blackfin.uclinux.org | 756 | W: http://blackfin.uclinux.org |
757 | S: Supported | 757 | S: Supported |
758 | 758 | ||
759 | BLACKFIN WATCHDOG DRIVER | ||
760 | P: Mike Frysinger | ||
761 | M: michael.frysinger@analog.com | ||
762 | M: vapier.adi@gmail.com | ||
763 | L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | ||
764 | W: http://blackfin.uclinux.org | ||
765 | S: Supported | ||
766 | |||
759 | BAYCOM/HDLCDRV DRIVERS FOR AX.25 | 767 | BAYCOM/HDLCDRV DRIVERS FOR AX.25 |
760 | P: Thomas Sailer | 768 | P: Thomas Sailer |
761 | M: t.sailer@alumni.ethz.ch | 769 | M: t.sailer@alumni.ethz.ch |