From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Apr 2010 14:26:31 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c1ec9c03efce5853f75e244ff368339767f7b9e;p=linux.git

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] max63xx driver depends on ioremap()
  [WATCHDOG] max63xx: be careful when disabling the watchdog
  [WATCHDOG] fixed book E watchdog period register mask.
  [WATCHDOG] omap4: Fix WDT Kconfig
---

1c1ec9c03efce5853f75e244ff368339767f7b9e