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: 1e07672 e12a3f8)

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	f479564ea4c2c5891ae0b02080cbdc30896bc794
tree	be5a99e62b5ff078413d71297154ece9f724ec9e	tree \| snapshot
parent	1e07672ee29c24ddf1f53e0cbb4175eec231b81f	commit \| diff
parent	e12a3f8616dc5ab78d1ff2c2d041deecbff407cf	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.