diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 21:13:03 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 21:13:03 +0100 |
commit | 995b4103a78b9bef0ff834f9ecac42b2b56e01a8 (patch) | |
tree | 2914c6906dfbf9b9c5b8c0ca6699da0844939e0f /kernel/time/clockevents.c | |
parent | Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/j... (diff) | |
parent | watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing (part 2) (diff) | |
download | linux-995b4103a78b9bef0ff834f9ecac42b2b56e01a8.tar.xz linux-995b4103a78b9bef0ff834f9ecac42b2b56e01a8.zip |
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 '')
0 files changed, 0 insertions, 0 deletions