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

Conflicts:
	drivers/of/Makefile

diff --cc drivers/of/Kconfig
Simple merge

diff --cc drivers/of/Makefile
index c1933a40f6b3e53abf96f87413672ca06b842d1e,14cb50372b3b4504a4b25ce6f7dd70e87bb2a427..3a426bb402f34fb814c240ba6a9a4c0f8f2b23f6
--- 1/drivers/of/Makefile
--- 2/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

diff --cc drivers/of/selftest.c
Simple merge

diff --cc include/linux/of.h
Simple merge