From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 14 Feb 2007 00:10:08 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: firefly_0821_release~31304^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=58a3bb59973e33a428d72fa530a3d1d81feb0e8f;p=firefly-linux-kernel-4.4.55.git

Merge /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
  ...
---

58a3bb59973e33a428d72fa530a3d1d81feb0e8f