summaryrefslogtreecommitdiff
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-06-15 23:58:03 (GMT)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-06-15 23:58:03 (GMT)
commit4d03754f04247bc4d469b78b61cac942df37445d (patch)
tree333bc9f33c1bda712508f3ff54b2ffece68930ef /kernel/watchdog.c
parent14ef05754f397d468926187d285b9fee55603e86 (diff)
parentbc75e99983df1efd977a5cd468893d55d52b8d70 (diff)
parent05dbbfe753792dcebb6b85d84fa5926f09723cfe (diff)
downloadlinux-4d03754f04247bc4d469b78b61cac942df37445d.tar.xz
Merge branches 'doc.2016.06.15a', 'fixes.2016.06.15b' and 'torture.2016.06.14a' into HEAD
doc.2016.06.15a: Documentation updates fixes.2016.06.15b: Documentation updates torture.2016.06.14a: Documentation updates