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] orion5x_wdt.c: 'ORION5X_TCLK' undeclared
  [WATCHDOG] gef_wdt.c: fsl_get_sys_freq() failure not noticed
  [WATCHDOG] ks8695_wdt.c: 'CLOCK_TICK_RATE' undeclared
  [WATCHDOG] rc32434_wdt: fix sections
  [WATCHDOG] rc32434_wdt: fix watchdog driver

...

This commit is contained in:

Linus Torvalds 2009-03-08 10:25:13 -07:00

parent 5b61f6accf c9a0c8a684

commit cd3c1cde26

4 changed files with 72 additions and 100 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/gef_wdt.c

View file

1

drivers/watchdog/ks8695_wdt.c

View file

1

drivers/watchdog/orion5x_wdt.c

View file

170

drivers/watchdog/rc32434_wdt.c

View file