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)
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


Trivial merge