Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] MTX-1 Watchdog driver [WATCHDOG] s3c2410_wdt - initialize watchdog irq resource [WATCHDOG] Kconfig menuconfig patch [WATCHDOG] pcwd.c: Port to the new device driver model [WATCHDOG] use mutex instead of semaphore in Berkshire USB-PC Watchdog driver [WATCHDOG] the scheduled removal of the i8xx_tco watchdog driver [WATCHDOG] Semi-typical watchdog bug re early misc_register() [WATCHDOG] add support for the w83627thf chipset.
Showing
- Documentation/feature-removal-schedule.txt 0 additions, 8 deletionsDocumentation/feature-removal-schedule.txt
- MAINTAINERS 0 additions, 6 deletionsMAINTAINERS
- drivers/char/watchdog/Kconfig 66 additions, 84 deletionsdrivers/char/watchdog/Kconfig
- drivers/char/watchdog/Makefile 1 addition, 1 deletiondrivers/char/watchdog/Makefile
- drivers/char/watchdog/cpu5wdt.c 7 additions, 7 deletionsdrivers/char/watchdog/cpu5wdt.c
- drivers/char/watchdog/eurotechwdt.c 11 additions, 11 deletionsdrivers/char/watchdog/eurotechwdt.c
- drivers/char/watchdog/i8xx_tco.c 0 additions, 571 deletionsdrivers/char/watchdog/i8xx_tco.c
- drivers/char/watchdog/i8xx_tco.h 0 additions, 42 deletionsdrivers/char/watchdog/i8xx_tco.h
- drivers/char/watchdog/ibmasr.c 5 additions, 6 deletionsdrivers/char/watchdog/ibmasr.c
- drivers/char/watchdog/machzwd.c 9 additions, 9 deletionsdrivers/char/watchdog/machzwd.c
- drivers/char/watchdog/mtx-1_wdt.c 238 additions, 0 deletionsdrivers/char/watchdog/mtx-1_wdt.c
- drivers/char/watchdog/pcwd.c 120 additions, 122 deletionsdrivers/char/watchdog/pcwd.c
- drivers/char/watchdog/pcwd_usb.c 4 additions, 4 deletionsdrivers/char/watchdog/pcwd_usb.c
- drivers/char/watchdog/s3c2410_wdt.c 3 additions, 3 deletionsdrivers/char/watchdog/s3c2410_wdt.c
- drivers/char/watchdog/sbc8360.c 14 additions, 14 deletionsdrivers/char/watchdog/sbc8360.c
- drivers/char/watchdog/w83627hf_wdt.c 18 additions, 5 deletionsdrivers/char/watchdog/w83627hf_wdt.c
Loading
Please register or sign in to comment