From: Gleb Natapov Date: Thu, 17 Oct 2013 14:04:47 +0000 (+0300) Subject: Powerpc KVM work is based on a commit after rc4. X-Git-Tag: v3.13-rc1~80^2~38 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13acfd5715144518232d8e29acf7c76ef1b089d8;p=pandora-kernel.git Powerpc KVM work is based on a commit after rc4. Merging master into next to satisfy the dependencies. Conflicts: arch/arm/kvm/reset.c --- 13acfd5715144518232d8e29acf7c76ef1b089d8 Reading git-diff-tree failed