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

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  mv watchdog tree under drivers
This commit is contained in:
Linus Torvalds
2007-10-18 14:56:25 -07:00
65 changed files with 3 additions and 3 deletions
-2
View File
@@ -632,8 +632,6 @@ config HVCS
source "drivers/char/ipmi/Kconfig"
source "drivers/char/watchdog/Kconfig"
config DS1620
tristate "NetWinder thermometer support"
depends on ARCH_NETWINDER