From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Oct 2014 10:47:50 +0000 (-0400)
Subject: Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~6705
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'devicetree-for-linus' of git://git./linux/kernel/git/glikely/linux

Pull devicetree changes from Grant Likely:
 "This branch contains bug fixes and new features for the devicetree
  code.

  Most of the changes are either new testcases for the selftest code or
  documentation changes.  The most notable change is the addition of a
  phandle resolver for use when grafting in a second device tree blob
  into the core tree.  The resolver isn't currently used by anything
  other than the selftest module, but it will be used to support device
  tree overlays; probably in the v3.19 timeframe.

  Also note that I've moved my normal tree from git.secretlab.ca to
  git.kernel.org"

* tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
  of/selftest: Move hash table off stack to fix large frame size
  To remove non-ascii characters in of_selftest.txt
  of/selftest: Use the resolver to fixup phandles
  of: Introduce Device Tree resolve support.
  of/selftest: Add a test for duplicate phandles
  of: Don't try to search when phandle == 0
  of/selftest: Test structure of device tree
  of: Fix NULL dereference in selftest removal code
  of: add vendor prefix for Chipidea
  of: Add vendor prefix for Innolux Corporation
  of: Add vendor prefix for Sitronix
  devicetree: bindings: Document Gateworks vendor prefix
  of: Add vendor prefix for Energy Micro
  dt/documentation: add specification of dma bus information
---

e98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 71259df,114bfe6..f67e3f8
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -130,8 -128,8 +133,9 @@@ sil	Silicon Imag
  silabs	Silicon Laboratories
  simtek
  sii	Seiko Instruments, Inc.
 +silergy	Silergy Corp.
  sirf	SiRF Technology, Inc.
+ sitronix	Sitronix Technology Corporation
  smsc	Standard Microsystems Corporation
  snps 	Synopsys, Inc.
  solidrun	SolidRun