From: Will Deacon <will.deacon@arm.com>
Date: Fri, 27 Mar 2015 12:22:50 +0000 (+0000)
Subject: Merge branch 'aarch64/kvm-bounce-page' into aarch64/for-next/core
X-Git-Tag: v4.1-rc1~112^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=849176c96dab827548176e851525bd1c3fff5a6a;p=uclinux-h8%2Flinux.git

Merge branch 'aarch64/kvm-bounce-page' into aarch64/for-next/core

Just as we thought we'd fixed this, another old linker reared its ugly
head trying to build linux-next. Unfortunately, it's the linker binary
provided on kernel.org, so give up trying to be clever and align the
hyp page to 4k.
---

849176c96dab827548176e851525bd1c3fff5a6a