Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
authorRadim Krčmář <rkrcmar@redhat.com>
Tue, 6 Dec 2016 13:49:05 +0000 (14:49 +0100)
committerRadim Krčmář <rkrcmar@redhat.com>
Tue, 6 Dec 2016 13:49:05 +0000 (14:49 +0100)
commit57d1da871b85c3a79e070d5cfc5ccb554ed839c4
treea697ed84ef44a6fe97abf4376ee56d03ae3d2e67
parentffcb09f27f46ea21305c7846de1fd3b76e4e6a6f
parente34af7849014f1d80899b811cf9021588cb8dd88
Merge branch 'kvm-ppc-next' of git://git./linux/kernel/git/paulus/powerpc

Eliminate merge conflict between 9e5f68842276 and ebe4535fbe7a.