git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ee71e27 2400197)

author	Martin Schwidefsky <schwidefsky@de.ibm.com>
	Mon, 9 Oct 2017 09:16:49 +0000 (11:16 +0200)
committer	Martin Schwidefsky <schwidefsky@de.ibm.com>
	Mon, 9 Oct 2017 09:16:49 +0000 (11:16 +0200)
commit	1b8d188d27e88741464da76b0a03533f42814e25
tree	be5a99e62b5ff078413d71297154ece9f724ec9e	tree \| snapshot
parent	ee71e2781734b918fca2d24e747a7debcd91f4b6	commit \| diff
parent	2400197c0808c5b9f07b02f7528f108e9b9a7803	commit \| diff

Merge branch 'sthyi' into features

Add the store-hypervisor-information code into features
using a tip branch for parallel merging into the KVM tree.

arch/s390/include/asm/sysinfo.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.