projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f99f5c b782a56)
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)
* 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


Trivial merge
Domain: System / Kernel;