Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 23:55:00 +0000 (15:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 23:55:00 +0000 (15:55 -0800)
commit324889b6bd2a89e0d69a2f9d133d6cf24579ab6c
tree8478d5b164113186cc735968de831cf680940b79
parent3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c
parentcb711a1931363b8ad4dc98df4a92c262ced8eeb4
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] iTCO_wdt.c - cleanup chipset documentation
  [WATCHDOG] iTCO_wdt: Add support for Intel Ibex Peak
  [WATCHDOG] CPUFREQ: S3C24XX Watchdog frequency scaling support.