diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-26 14:11:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-26 14:11:17 -0700 |
| commit | d6702d840c0e34b0ef8b2a1932a762724db96c79 (patch) | |
| tree | 3b1bc7a375af7882cc2ebb7a0b9da997ab5e7e04 /tools | |
| parent | 4c4fe4c24782bf5bc533b3df34599301ec31b605 (diff) | |
| parent | 1833c9f647e9bda1cd24653ff8f9c207b5f5b911 (diff) | |
| download | linux-d6702d840c0e34b0ef8b2a1932a762724db96c79.tar.gz linux-d6702d840c0e34b0ef8b2a1932a762724db96c79.tar.bz2 linux-d6702d840c0e34b0ef8b2a1932a762724db96c79.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions