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: at32ap700x_wdt: register misc device last in probe() function
  watchdog: [PATCH 3/3] imx2_wdt: fix section mismatch

...

This commit is contained in:

Linus Torvalds 2010-06-27 07:38:20 -07:00

parent e6d1336188 f1f5bda4e9

commit 064c946a0c

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

16

drivers/watchdog/at32ap700x_wdt.c

View file

1

drivers/watchdog/imx2_wdt.c

View file