From: Michael Ellerman <mpe@ellerman.id.au>
Date: Tue, 13 Mar 2018 04:08:41 +0000 (+1100)
Subject: Merge two commits from 'kvm-ppc-fixes' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2852aab819574fbcd9fa2cba8a263479506c5f70;p=people%2Fms%2Flinux.git

Merge two commits from 'kvm-ppc-fixes' into next

This merges two commits from the `kvm-ppc-fixes` branch into next, as
they fix build breaks we are seeing while testing next.
---

2852aab819574fbcd9fa2cba8a263479506c5f70