| commit | 96b0e525af62eb3dcc084b091b40add082467150 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 18 06:45:52 2017 -0400 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 18 06:45:52 2017 -0400 |
| tree | 08c45d7ca851bbca7a943c5e18eac4707d0564e6 | |
| parent | 503f7e297d76bf109533eef3287ad821f05e47a4 [diff] | |
| parent | 0015a978a254c528f52ce17bbeba612be0d75e22 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 fixes from Martin Schwidefsky: "Two bug fixes: - A fix for cputime accounting vs CPU hotplug - Add two options to zfcpdump_defconfig to make SCSI dump work again" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: fix zfcpdump-config s390/cputime: fix guest/irq/softirq times after CPU hotplug