From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2014 21:27:15 +0000 (-0700)
Subject: Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Tag: MMI-PSA29.97-13-9~12482
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9f2b21a32906a47c220b5167b88869f2c90f1c4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull devicetree changes from Grant Likely:
 "Updates to devicetree core code.  This branch contains the following
  notable changes:

   - add reserved memory binding
   - make struct device_node a kobject and remove legacy
     /proc/device-tree
   - ePAPR conformance fixes
   - update in-kernel DTC copy to version v1.4.0
   - preparatory changes for dynamic device tree overlays
   - minor bug fixes and documentation changes

  The most significant change in this branch is the conversion of struct
  device_node to be a kobject that is exposed via sysfs and removal of
  the old /proc/device-tree code.  This simplifies the device tree
  handling code and tightens up the lifecycle on device tree nodes.

  [updated: added fix for dangling select PROC_DEVICETREE]"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (29 commits)
  dt: Remove dangling "select PROC_DEVICETREE"
  of: Add support for ePAPR "stdout-path" property
  of: device_node kobject lifecycle fixes
  of: only scan for reserved mem when fdt present
  powerpc: add support for reserved memory defined by device tree
  arm64: add support for reserved memory defined by device tree
  of: add missing major vendors
  of: add vendor prefix for SMSC
  of: remove /proc/device-tree
  of/selftest: Add self tests for manipulation of properties
  of: Make device nodes kobjects so they show up in sysfs
  arm: add support for reserved memory defined by device tree
  drivers: of: add support for custom reserved memory drivers
  drivers: of: add initialization code for dynamic reserved memory
  drivers: of: add initialization code for static reserved memory
  of: document bindings for reserved-memory nodes
  Revert "of: fix of_update_property()"
  kbuild: dtbs_install: new make target
  ARM: mvebu: Allows to get the SoC ID even without PCI enabled
  of: Allows to use the PCI translator without the PCI core
  ...
---

b9f2b21a32906a47c220b5167b88869f2c90f1c4
diff --cc drivers/of/base.c
index 5f81bfea5246,be2861d69b02..4557a142c752
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@@ -21,9 -21,9 +21,10 @@@
  #include <linux/cpu.h>
  #include <linux/module.h>
  #include <linux/of.h>
 +#include <linux/of_graph.h>
  #include <linux/spinlock.h>
  #include <linux/slab.h>
+ #include <linux/string.h>
  #include <linux/proc_fs.h>
  
  #include "of_private.h"