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

diff --combined drivers/char/Kconfig
index 4dbee616eac6c196cffee839effdcd5682e99486,69f85185478272b62e25f68cb1c5a0563e9f56e4..65491103e0fbc6c50ab9efa099d017806b58b3ba
--- 1/drivers/char/Kconfig
--- 2/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -36,6 -36,23 +36,6 @@@ config V
          If unsure, say Y, or else you won't be able to do much with your new
          shiny Linux system :-)
  
 -config VT_UNICODE
 -      bool "Virtual console is Unicode by default"
 -      depends on VT
 -      default n
 -      ---help---
 -        If you say Y here, the virtual terminal will be in UTF-8 by default,
 -        and the keyboard will run in unicode mode.
 -
 -        If you say N here, the virtual terminal will not be in UTF-8 by
 -        default, and the keyboard will run in XLATE mode.
 -
 -        This can also be changed by passing 'default_utf8=<0|1>' on the
 -        kernel command line.
 -
 -        Historically, the kernel has defaulted to non-UTF8 and XLATE mode.
 -        If unsure, say N here.
 -
  config VT_CONSOLE
        bool "Support for console on virtual terminal" if EMBEDDED
        depends on VT
@@@ -632,8 -649,6 +632,6 @@@ config HVC
  
  source "drivers/char/ipmi/Kconfig"
  
- source "drivers/char/watchdog/Kconfig"
- 
  config DS1620
        tristate "NetWinder thermometer support"
        depends on ARCH_NETWINDER