Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Oct 2015 13:59:36 +0000 (14:59 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Oct 2015 13:59:36 +0000 (14:59 +0100)
commit3ec20e2e618314a798c81a974455b0a47e2af435
treec36ee1a6ed3a8c28911f6ae95f7cf060c2087189
parent3c68319b28474055481824032e6730c28404116f
parentdaad0bf1491e5321c76a6ba4ccf50a4991494aa8
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