tree e343b4754bf55f5bd21c5863846b85e5939efda1
parent 2946369ee277fa9fcc3372aabddc9c15dfabf744
parent 825600c0f20e595daaa7a6dd8970f84fa2a2ee57
author Linus Torvalds <torvalds@linux-foundation.org> 1396040233 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1396040233 -0700

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