From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Oct 2015 13:59:36 +0000 (+0100)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: drm-fsl-dcu-for-next~2405
X-Git-Url: http://git.agner.ch/gitweb/?a=commitdiff_plain;h=3ec20e2e618314a798c81a974455b0a47e2af435;p=linux-drm-fsl-dcu.git

Merge branch 'for-linus' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "Three bug fixes and an update to the default configuration"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/defconfig: set SCSI_DH=y
  s390/vtime: correct scaled cputime of partially idle CPUs
  s390/boot/decompression: disable floating point in decompressor
  s390/numa: use correct type for node_to_cpumask_map
---

3ec20e2e618314a798c81a974455b0a47e2af435