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] use resource_size()
  [WATCHDOG] iTCO_wdt: add PCI ID for the Intel EP80579 (Tolapai) SoC

...

This commit is contained in:

Linus Torvalds 2009-12-23 16:12:16 -08:00

parent 2f99f5c8f0 b782a56375

commit f51671fc85

10 changed files with 18 additions and 17 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

4

drivers/watchdog/adx_wdt.c

View file

2

drivers/watchdog/at32ap700x_wdt.c

View file

2

drivers/watchdog/davinci_wdt.c

View file

4

drivers/watchdog/iTCO_wdt.c

View file

2

drivers/watchdog/mpcore_wdt.c

View file

2

drivers/watchdog/mv64x60_wdt.c

View file

9

drivers/watchdog/omap_wdt.c

View file

2

drivers/watchdog/pnx4008_wdt.c

View file

2

drivers/watchdog/s3c2410_wdt.c

View file

6

drivers/watchdog/txx9wdt.c

View file