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: (23 commits) [WATCHDOG] timers cleanup [WATCHDOG] ib700wdt.c - convert to platform_device part 2 [WATCHDOG] ib700wdt.c - convert to platform_device [WATCHDOG] ib700wdt.c spinlock/WDIOC_SETOPTIONS changes [WATCHDOG] ib700wdt.c small clean-up's [WATCHDOG] ib700wdt.c clean-up init and exit routines [WATCHDOG] ib700_wdt.c stop + set_heartbeat operations [WATCHDOG] show default value for nowayout in module parameter [WATCHDOG] advantechwdt.c - convert to platform_device part 2 [WATCHDOG] advantechwdt.c - convert to platform_device [WATCHDOG] advantechwdt.c - move set_heartbeat to a seperate function [WATCHDOG] advantechwdt.c - cleanup before platform_device patches [WATCHDOG] acquirewdt.c - convert to platform_device part 2 [WATCHDOG] acquirewdt.c - convert to platform_device [WATCHDOG] acquirewdt.c - clean before platform_device patches [WATCHDOG] pcwd_usb.c - get heartbeat from dip switches [WATCHDOG] pcwd.c - e-mail adres update [WATCHDOG] pcwd_usb.c - get heartbeat from dip switches [WATCHDOG] pcwd_usb.c - document includes [WATCHDOG] pcwd_pci.c - spinlock fixes ...
Showing
- drivers/char/watchdog/acquirewdt.c 88 additions, 67 deletionsdrivers/char/watchdog/acquirewdt.c
- drivers/char/watchdog/advantechwdt.c 88 additions, 54 deletionsdrivers/char/watchdog/advantechwdt.c
- drivers/char/watchdog/alim1535_wdt.c 1 addition, 1 deletiondrivers/char/watchdog/alim1535_wdt.c
- drivers/char/watchdog/alim7101_wdt.c 4 additions, 11 deletionsdrivers/char/watchdog/alim7101_wdt.c
- drivers/char/watchdog/cpu5wdt.c 4 additions, 9 deletionsdrivers/char/watchdog/cpu5wdt.c
- drivers/char/watchdog/eurotechwdt.c 1 addition, 1 deletiondrivers/char/watchdog/eurotechwdt.c
- drivers/char/watchdog/i6300esb.c 1 addition, 1 deletiondrivers/char/watchdog/i6300esb.c
- drivers/char/watchdog/i8xx_tco.c 1 addition, 1 deletiondrivers/char/watchdog/i8xx_tco.c
- drivers/char/watchdog/iTCO_wdt.c 3 additions, 3 deletionsdrivers/char/watchdog/iTCO_wdt.c
- drivers/char/watchdog/ib700wdt.c 127 additions, 65 deletionsdrivers/char/watchdog/ib700wdt.c
- drivers/char/watchdog/ibmasr.c 1 addition, 1 deletiondrivers/char/watchdog/ibmasr.c
- drivers/char/watchdog/indydog.c 1 addition, 1 deletiondrivers/char/watchdog/indydog.c
- drivers/char/watchdog/machzwd.c 6 additions, 12 deletionsdrivers/char/watchdog/machzwd.c
- drivers/char/watchdog/mixcomwd.c 7 additions, 9 deletionsdrivers/char/watchdog/mixcomwd.c
- drivers/char/watchdog/pc87413_wdt.c 1 addition, 1 deletiondrivers/char/watchdog/pc87413_wdt.c
- drivers/char/watchdog/pcwd.c 23 additions, 9 deletionsdrivers/char/watchdog/pcwd.c
- drivers/char/watchdog/pcwd_pci.c 28 additions, 6 deletionsdrivers/char/watchdog/pcwd_pci.c
- drivers/char/watchdog/pcwd_usb.c 39 additions, 24 deletionsdrivers/char/watchdog/pcwd_usb.c
- drivers/char/watchdog/pnx4008_wdt.c 2 additions, 1 deletiondrivers/char/watchdog/pnx4008_wdt.c
- drivers/char/watchdog/s3c2410_wdt.c 36 additions, 26 deletionsdrivers/char/watchdog/s3c2410_wdt.c
Please register or sign in to comment