tree cdc0f8fc2f27608f7c32d1069baeeae2b13432f1
parent 35dead4235e2b67da7275b4122fed37099c2f462
parent 810a90ae4d2a9f6d9ff80424accbd6f91947e981
author Linus Torvalds <torvalds@linux-foundation.org> 1259797129 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1259797129 -0800

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()