arm64: smp: Fix mismerge
authorMark Brown <broonie@linaro.org>
Mon, 9 Jun 2014 18:31:52 +0000 (19:31 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 9 Jun 2014 18:31:52 +0000 (19:31 +0100)
commit3d9077e6d4a37b51eda3039f2c376697a5329fb9
treec81a612e1c592d58a850434a2ca4bb20f6049d4d
parente2a3fd224d41eef99d325a2462abb21ccee76812
arm64: smp: Fix mismerge

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