diff options
| author | Linus Torvalds <[email protected]> | 2017-10-18 10:45:52 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-10-18 10:45:52 +0000 |
| commit | 96b0e525af62eb3dcc084b091b40add082467150 (patch) | |
| tree | 08c45d7ca851bbca7a943c5e18eac4707d0564e6 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | Merge tag 'trace-v4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | s390: fix zfcpdump-config (diff) | |
| download | kernel-96b0e525af62eb3dcc084b091b40add082467150.tar.gz kernel-96b0e525af62eb3dcc084b091b40add082467150.zip | |
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
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions