OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9065f4
0b991f5
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 29 Jul 2015 17:23:14 +0000
(10:23 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 29 Jul 2015 17:23:14 +0000
(10:23 -0700)
Pull s390 fixes from Martin Schwidefsky:
"Two bug fixes:
- fix a crash on pre-z10 hardware due to cache-info
- fix an issue with classic BPF programs in the eBPF JIT"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/cachinfo: add missing facility check to init_cache_level()
s390/bpf: clear correct BPF accumulator register
Trivial merge