Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Dec 2009 00:12:16 +0000 (16:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Dec 2009 00:12:16 +0000 (16:12 -0800)
commitf51671fc85562cdcc64ca59fe92719863c7c25f1
tree2f68b0ddeb5840573d63035b2f8f482d60482f6d
parent2f99f5c8f05e02f3df1bb4d93b6704e6f5972872
parentb782a563758ac963c794d9fbaaff494140c28fd6
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