From: Heiko Carstens Date: Fri, 4 Apr 2008 13:12:40 +0000 (+0200) Subject: KVM: s390: rename stfl to kvm_stfl X-Git-Tag: v2.6.26-rc1~1028^2~48 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f603f0731f43421403160f5f8b12e90f2e51f064;p=pandora-kernel.git KVM: s390: rename stfl to kvm_stfl Temporarily rename this function to avoid merge conflicts and/or dependencies. This function will be removed as soon as git-s390 and kvm.git are finally upstream. Signed-off-by: Heiko Carstens Signed-off-by: Carsten Otte Signed-off-by: Avi Kivity --- Reading git-diff-tree failed