diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 12:13:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 12:13:03 -0800 |
| commit | 995b4103a78b9bef0ff834f9ecac42b2b56e01a8 (patch) | |
| tree | 2914c6906dfbf9b9c5b8c0ca6699da0844939e0f /drivers/w1 | |
| parent | 89307babf966165171547f105e2253dec261cfa5 (diff) | |
| parent | 0d098587cec70048336a3809bcde8044c7e9aa08 (diff) | |
| download | linux-995b4103a78b9bef0ff834f9ecac42b2b56e01a8.tar.bz2 | |
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing (part 2)
watchdog: hpwdt: Changes to handle NX secure bit in 32bit path
watchdog: sp805: Fix section mismatch in ID table.
watchdog: move coh901327 state holders
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions