Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 18 Oct 2007 21:56:25 +0000 (14:56 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 18 Oct 2007 21:56:25 +0000 (14:56 -0700)
commitab08ed1770140ebcf1be1657087689832b755874
treea74c6eaa042801699d25dbef60c8bea597afdfc2
parent54e840dd5021ae03c5d2b4158b191bb67f584b75
parentb7e04f8c61a46d742de23af5d7ca2b41b33e40ac
Merge git://git./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
drivers/char/Kconfig