From: Mark Brown <broonie@kernel.org>
Date: Thu, 19 Feb 2015 10:17:10 +0000 (+0900)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~19^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6e46ae658e4443e765f87702603deca167f2b57;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/of/Makefile
---

f6e46ae658e4443e765f87702603deca167f2b57
diff --cc drivers/of/Makefile
index c1933a40f6b3,14cb50372b3b..3a426bb402f3
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@@ -12,7 -12,5 +12,8 @@@ obj-$(CONFIG_OF_MDIO)	+= of_mdio.
  obj-$(CONFIG_OF_PCI)	+= of_pci.o
  obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
  obj-$(CONFIG_OF_MTD)	+= of_mtd.o
 +obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
  obj-$(CONFIG_OF_RESOLVE)  += resolver.o
+ obj-$(CONFIG_OF_OVERLAY) += overlay.o
 +
 +CFLAGS_fdt.o = -I$(src)/../../scripts/dtc/libfdt