projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 503f7e2 0015a97)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Oct 2017 10:45:52 +0000 (06:45 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Oct 2017 10:45:52 +0000 (06:45 -0400)
commit96b0e525af62eb3dcc084b091b40add082467150
tree08c45d7ca851bbca7a943c5e18eac4707d0564e6tree | snapshot
parent503f7e297d76bf109533eef3287ad821f05e47a4commit | diff
parent0015a978a254c528f52ce17bbeba612be0d75e22commit | diff
Merge branch 'for-linus' of git://git./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
Domain: System / Kernel;