diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-23 00:43:18 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-23 00:43:18 +0100 |
commit | ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7 (patch) | |
tree | eccc63c0a71bf7372e548cc7295de61179c022c0 /net | |
parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
parent | s390/dis: Fix handling of format specifiers (diff) | |
download | linux-ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7.tar.xz linux-ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two late bug fixes for kernel 4.4.
Merry Christmas"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/dis: Fix handling of format specifiers
s390/zcrypt: Fix AP queue handling if queue is full
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions