git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 91a1fad 3d8757b)

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	3bdf5679c9e46088a0d677e795afc92b5f77940f
tree	be5a99e62b5ff078413d71297154ece9f724ec9e	tree \| snapshot
parent	91a1fad759ffd616b836984ca0420c7ad5996eef	commit \| diff
parent	3d8757b87d7fc15a87928bc970f060bc9c6dc618	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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git