From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Dec 2009 00:12:16 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: upstream/snapshot3+hdmi~16015
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f51671fc85562cdcc64ca59fe92719863c7c25f1;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.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] use resource_size()
  [WATCHDOG] iTCO_wdt: add PCI ID for the Intel EP80579 (Tolapai) SoC
---

f51671fc85562cdcc64ca59fe92719863c7c25f1