From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Dec 2015 23:43:18 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: MMI-PSA29.97-13-9~8835
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7