From: Radim Krčmář <rkrcmar@redhat.com>
Date: Tue, 6 Dec 2016 13:49:05 +0000 (+0100)
Subject: Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus... 
X-Git-Tag: v4.14-rc1~1910^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57d1da871b85c3a79e070d5cfc5ccb554ed839c4;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'kvm-ppc-next' of git://git./linux/kernel/git/paulus/powerpc

Eliminate merge conflict between 9e5f68842276 and ebe4535fbe7a.
---

57d1da871b85c3a79e070d5cfc5ccb554ed839c4