From: Mark Brown <broonie@kernel.org>
Date: Sat, 13 Sep 2014 17:23:07 +0000 (-0700)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into lsk-v3.10-arm64-misc
X-Git-Tag: firefly_0821_release~3680^2~36^2~24^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=42efaeacb71aaf538a80aa22056522d81e63d7fd;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/of/fdt.c
---

42efaeacb71aaf538a80aa22056522d81e63d7fd