From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Dec 2009 23:38:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.32~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bbbb45a02ba1c4dcec2fe2b5531750d6616765b9;p=users%2Fhch%2Fblock.git

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:
  [PATCH] rc32434_wdt: fix compilation failure
  [WATCHDOG] rc32434_wdt.c: use resource_size()
---

bbbb45a02ba1c4dcec2fe2b5531750d6616765b9