| commit | f51671fc85562cdcc64ca59fe92719863c7c25f1 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 24 Dec 2009 00:12:16 +0000 (23 16:12 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 24 Dec 2009 00:12:16 +0000 (23 16:12 -0800) | ||
| tree | 2f68b0ddeb5840573d63035b2f8f482d60482f6d | treesnapshot (tar.gz zip) |
| parent | 2f99f5c8f05e02f3df1bb4d93b6704e6f5972872 | commitdiff |
| parent | b782a563758ac963c794d9fbaaff494140c28fd6 | commitdiff |
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
* 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