]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 79a2d02 a46daaa)
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)
commit949056852efd5f46bb800cb1d382faf78c91a746
tree08c45d7ca851bbca7a943c5e18eac4707d0564e6tree | snapshot
parent79a2d0225d3bca37d77853542b89fb8fbba456b4commit | diff
parenta46daaa4512abd442ce05f9d50c31ca9d463714acommit | 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
Linux Kernel Source Tree.