git » linux-kernel » commit bbbb45a

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

author Linus Torvalds
2009-12-02 23:38:49 UTC
committer Linus Torvalds
2009-12-02 23:38:49 UTC
parent 810a90ae4d2a9f6d9ff80424accbd6f91947e981
parent 35dead4235e2b67da7275b4122fed37099c2f462
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()