Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commitee7cbabbd359b5d9a60de3d5f1693163e07987ca
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:37:28 +0000 (27 14:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:37:28 +0000 (27 14:37 -0700)
tree29c3b01f8cdb26ccf69acaf5d0a64eefab87f7b3
parenta152db71d962f405f7e9be5c818bddf6d1be50a7
parent3ccd3ec6d4a7750c49c4d2bbcc1d0e82cd4c8a7f
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:
  [WATCHDOG] removed unused #include <version.h>
  [WATCHDOG] at91rm9200_wdt.c: fix misleading indentation
  [WATCHDOG] mpc8xxx_wdt: fix modular build
  [WATCHDOG] hpwdt.c kdebug support
  [WATCHDOG] Add support for the IDT RC32434 watchdog
  [WATCHDOG] Add support for the built-int RDC R-321x SoC watchdog
  [WATHDOG] delete unused driver mpc8xx_wdt.c
  [WATCHDOG] Fix s3c2410_wdt driver coding style issues
  [WATCHDOG] Clean out header of s3c2410_wdt driver.
  [WATCHDOG] Fix NULL usage in s3c2410_wdt driver.