ARM: samsung: Fix mismerge with new libfdt changes

The merge with the new FDT changes incorrectly changed mfc_mem to be a
local variable causing boot failures.

Signed-off-by: Mark Brown <broonie@kernel.org>
Merge remote-tracking branch 'lsk/v3.14/topic/libfdt' into linux-linaro-lsk-v3.14
Merge remote-tracking branch 'lsk/v3.14/topic/libfdt' into lsk-v3.14-arm64-misc
arm64: add support for reserved memory defined by device tree

Enable reserved memory initialization from device tree.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce)
Signed-off-by: Mark Brown <broonie@kernel.org>
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-misc' into linux-linaro-lsk-v3.14