aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2011-12-30 12:13:03 -0800
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2011-12-30 12:13:03 -0800
commit995b4103a78b9bef0ff834f9ecac42b2b56e01a8 (patch)
tree2914c6906dfbf9b9c5b8c0ca6699da0844939e0f /kernel
parentMerge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/j... (diff)
parentwatchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing (part 2) (diff)
downloadlinux-995b4103a78b9bef0ff834f9ecac42b2b56e01a8.tar.gz
linux-995b4103a78b9bef0ff834f9ecac42b2b56e01a8.tar.bz2
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 'kernel')
0 files changed, 0 insertions, 0 deletions