From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Mar 2015 21:11:17 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: firefly_0821_release~176^2~2099
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d6702d840c0e34b0ef8b2a1932a762724db96c79;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes for s390.

  The ftrace comile fix is quite large for a -rc6 release, but it would
  be nice to have it in 4.0"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/smp: reenable smt after resume
  s390/mm: limit STACK_RND_MASK for compat tasks
  s390/ftrace: fix compile error if CONFIG_KPROBES is disabled
  s390/cpum_sf: add diagnostic sampling event only if it is authorized
---

d6702d840c0e34b0ef8b2a1932a762724db96c79