From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Dec 2016 19:49:41 +0000 (-0800)
Subject: Merge tag 'devicetree-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6df8b74b1720db1133ace0861cb6721bfe57819a;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'devicetree-for-4.10' of git://git./linux/kernel/git/robh/linux

Pull DeviceTree updates from Rob Herring:

 - add various vendor prefixes.

 - fix NUMA node handling when "numa=off" is passed on kernel command
   line.

 - coding style Clean-up of overlay handling code.

 - DocBook fixes in DT platform driver code

 - Altera SoCFPGA binding addtions for freeze bridge, arria10 FPGA
   manager and FPGA bridges.

 - a couple of printk message fixes.

* tag 'devicetree-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (33 commits)
  dt: pwm: bcm2835: fix typo in clocks property name
  devicetree: add vendor prefix for National Instruments
  Revert "of: base: add support to get machine model name"
  of: Fix issue where code would fall through to error case.
  drivers/of: fix missing pr_cont()s in of_print_phandle_args
  devicetree: bindings: Add vendor prefix for Oki
  devicetree: bindings: Add vendor prefix for Andes Technology Corporation
  dt-bindings: add MYIR Tech hardware vendor prefix
  add bindings document for altera freeze bridge
  ARM: socfpga: add bindings doc for arria10 fpga manager
  ARM: socfpga: add bindings document for fpga bridge drivers
  of: base: add support to get machine model name
  of/platform: clarify of_find_device_by_node refcounting
  of/platform: fix of_platform_device_destroy comment
  of: Remove unused variable overlay_symbols
  of: Move setting of pointer to beside test for non-null
  of: Add back an error message, restructured
  of: Update comments to reflect changes and increase clarity
  of: Remove redundant size check
  of: Update structure of code to be clearer, also remove BUG_ON()
  ...
---

6df8b74b1720db1133ace0861cb6721bfe57819a
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 078834a5fd85,ffc8689abfd3..6e25c912a5c2
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -161,9 -160,9 +163,10 @@@ lg	LG Corporatio
  linux	Linux-specific binding
  lltc	Linear Technology Corporation
  lsi	LSI Corp. (LSI Logic)
+ macnica	Macnica Americas
  marvell	Marvell Technology Group Ltd.
  maxim	Maxim Integrated Products
 +mcube	mCube
  meas	Measurement Specialties
  mediatek	MediaTek Inc.
  melexis	Melexis N.V.
@@@ -197,6 -195,6 +201,7 @@@ ni	National Instrument
  nintendo	Nintendo
  nokia	Nokia
  nuvoton	Nuvoton Technology Corporation
++nvd	New Vision Display
  nvidia	NVIDIA
  nxp	NXP Semiconductors
  okaya	Okaya Electric America, Inc.