Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2015 23:43:18 +0000 (15:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2015 23:43:18 +0000 (15:43 -0800)
commitad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7
treeeccc63c0a71bf7372e548cc7295de61179c022c0
parentea828131909d77ae3185991669ecc0152519ea1d
parent272fa59ccb4fc802af28b1d699c2463db6a71bf7
Merge branch 'for-linus' of git://git./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