Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] w83627hf_wdt.c: add support for the W83627EHF support
  [WATCHDOG] SA1100 watchdog maximum timeout
  [WATCHDOG] w83697ug, fix lock imbalance
  [WATCHDOG] drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons

...

This commit is contained in:

Linus Torvalds 2009-07-09 20:45:01 -07:00

parent 016d3569bf cf1eaab252

commit b690a3770e

4 changed files with 12 additions and 4 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

2

drivers/watchdog/bcm47xx_wdt.c

View file

5

drivers/watchdog/sa1100_wdt.c

View file

5

drivers/watchdog/w83627hf_wdt.c

View file

4

drivers/watchdog/w83697ug_wdt.c

View file