tree c36ee1a6ed3a8c28911f6ae95f7cf060c2087189
parent 3c68319b28474055481824032e6730c28404116f
parent daad0bf1491e5321c76a6ba4ccf50a4991494aa8
author Linus Torvalds <torvalds@linux-foundation.org> 1444139976 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> 1444139976 +0100

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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