Powerpc KVM work is based on a commit after rc4.
authorGleb Natapov <gleb@redhat.com>
Thu, 17 Oct 2013 14:04:47 +0000 (17:04 +0300)
committerGleb Natapov <gleb@redhat.com>
Thu, 17 Oct 2013 14:41:49 +0000 (17:41 +0300)
Merging master into next to satisfy the dependencies.

Conflicts:
arch/arm/kvm/reset.c


Trivial merge