commit | 0cdc050ea0aa3df82784b31c4475bce01240301d | [log] [tgz] |
---|---|---|
author | Mark Brown <broonie@kernel.org> | Thu Sep 11 21:39:05 2014 +0100 |
committer | Mark Brown <broonie@kernel.org> | Thu Sep 11 21:39:05 2014 +0100 |
tree | 1ebe633cabc57570a87e6734acd369814e42154d | |
parent | a7d43c3d6f103c145437d75265c1e91918d205c3 [diff] |
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>