arm64: fpsimd: Fix mismerge
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 16:26:36 +0000 (17:26 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 16:26:36 +0000 (17:26 +0100)
commitdefd110d5c8bd987868c8269f8dc7860fd6daec1
tree40aa575e73cb7713b06496d76c1f43b5f6c661a8
parent609b572c324c1ce7b54c55dad6270b08e7e930f6
arm64: fpsimd: Fix mismerge

Thanks to AKASHI Takahiro for identifying the issue.

Signed-off-by: Mark Brown <broonie@linaro.org>
arch/arm64/kernel/fpsimd.c