Merge git://www.linux-watchdog.org/linux-watchdog

Browse source

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Convert wm831x driver to watchdog core
  watchdog: s3c2410: convert to use the watchdog framework
  Documentation: watchdog: add guide how to convert drivers to new framework
  watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing
  watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver
  watchdog: irq: Remove IRQF_DISABLED
  watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD
  watchdog: sc520_wdt: Remove unnecessary cast.

...

This commit is contained in:

Linus Torvalds 2011-11-05 15:39:39 -07:00

parent cd3f07d1e6 00411ee930

commit 06d8eb1b7d

14 changed files with 388 additions and 374 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

195

Documentation/watchdog/convert_drivers_to_kernel_api.txt

View file

2

drivers/watchdog/Kconfig

View file

2

drivers/watchdog/coh901327_wdt.c

View file

2

drivers/watchdog/eurotechwdt.c

View file

19

drivers/watchdog/iTCO_wdt.c

View file

3

drivers/watchdog/mpcore_wdt.c

View file

2

drivers/watchdog/octeon-wdt-main.c

View file

176

drivers/watchdog/s3c2410_wdt.c

View file

4

drivers/watchdog/sb_wdog.c

View file

2

drivers/watchdog/sc520_wdt.c

View file

33

drivers/watchdog/w83627hf_wdt.c

View file

2

drivers/watchdog/wdt.c

View file

2

drivers/watchdog/wdt_pci.c

View file

318

drivers/watchdog/wm831x_wdt.c

View file