summaryrefslogtreecommitdiff
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-08 14:36:14 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-08 14:36:14 (GMT)
commitbb3c90f0de7b34995b5e35cf5dc97a3d428b3761 (patch)
treed5d07b61c0ab6d8688579a255e2b97b624637336 /kernel/watchdog.c
parent3d762ca1cdf38b5fb7d1774734176d1d4d56bbb7 (diff)
parent8838101183bba239f100b0cfe31d9ebbfc2f1bd4 (diff)
downloadlinux-fsl-qoriq-bb3c90f0de7b34995b5e35cf5dc97a3d428b3761.tar.xz
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] compile fix for latest binutils [S390] cio: prevent purging of CCW devices in the online state [S390] qdio: fix init sequence [S390] Fix parameter passing for smp_switch_to_cpu() [S390] oprofile s390: prevent stack corruption
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions