From: Mark Brown <broonie@linaro.org>
Date: Fri, 25 Jul 2014 11:50:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~40
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=108212d3384e981273049b8d007edcf612f1eda4;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
	arch/arm64/mm/tlb.S
---

108212d3384e981273049b8d007edcf612f1eda4