Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Dec 2009 23:38:49 +0000 (15:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Dec 2009 23:38:49 +0000 (15:38 -0800)
commitbbbb45a02ba1c4dcec2fe2b5531750d6616765b9
treecdc0f8fc2f27608f7c32d1069baeeae2b13432f1
parent35dead4235e2b67da7275b4122fed37099c2f462
parent810a90ae4d2a9f6d9ff80424accbd6f91947e981
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:
  [PATCH] rc32434_wdt: fix compilation failure
  [WATCHDOG] rc32434_wdt.c: use resource_size()