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] iTCO_wdt: fix SMI_EN regression 2

...

This commit is contained in:

Linus Torvalds 2009-02-17 14:07:18 -08:00

parent 11df586407 12d60e28be

commit 68cc8301b4

3 changed files with 43 additions and 26 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/Kconfig

View file

32

drivers/watchdog/iTCO_vendor_support.c

View file

35

drivers/watchdog/iTCO_wdt.c

View file