| commit | f51671fc85562cdcc64ca59fe92719863c7c25f1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 23 16:12:16 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 23 16:12:16 2009 -0800 |
| tree | 2f68b0ddeb5840573d63035b2f8f482d60482f6d | |
| parent | 2f99f5c8f05e02f3df1bb4d93b6704e6f5972872 [diff] | |
| parent | b782a563758ac963c794d9fbaaff494140c28fd6 [diff] |
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: [WATCHDOG] use resource_size() [WATCHDOG] iTCO_wdt: add PCI ID for the Intel EP80579 (Tolapai) SoC