summaryrefslogtreecommitdiffstats
path: root/kernel/kthread.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-28 13:57:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-28 13:57:13 -0700
commitbc53267e97e4942e7f22c31cd8cf87840796accb (patch)
treee343b4754bf55f5bd21c5863846b85e5939efda1 /kernel/kthread.c
parent2946369ee277fa9fcc3372aabddc9c15dfabf744 (diff)
parent825600c0f20e595daaa7a6dd8970f84fa2a2ee57 (diff)
Merge branch 'akpm' (patches from Andrew Morton)
Merge two fixes from Andrew Morton: "The x86 fix should come from x86 guys but they appear to be conferencing or otherwise distracted. The ocfs2 fix is a bit of a mess - the code runs into an immediate NULL deref and we're trying to work out how this got through test and review, but we haven't heard from Goldwyn in the past few days. Sasha's patch fixes the oops, but the feature as a whole is probably broken. So this is a stopgap for 3.14 - I'll aim to get the real fixes into 3.14.x" * emailed patches from Andrew Morton akpm@linux-foundation.org>: x86: fix boot on uniprocessor systems ocfs2: check if cluster name exists before deref
Diffstat (limited to 'kernel/kthread.c')
0 files changed, 0 insertions, 0 deletions