Merge remote-tracking branch 'dt-rh/for-next'

Conflicts:
	Documentation/kernel-parameters.txt

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 1d1941339c071c13605c907490694fc05069218d,cdb0793accf15ed0cf6b175c60567e7733bb7cc0..67a7b0f46b5616e609fbedbf6323f9feac1f73f1
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -73,9 -73,9 +73,10 @@@ lantiq       Lantiq Semiconducto
  lg    LG Corporation
  linux Linux-specific binding
  lsi   LSI Corp. (LSI Logic)
 +lltc  Linear Technology Corporation
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
+ micrel        Micrel Inc.
  microchip     Microchip Technology Inc.
  mosaixtech    Mosaix Technologies, Inc.
  moxa  Moxa

diff --cc Documentation/kernel-parameters.txt
index 73368ca1339c6014731712a140b85313c9043228,4946d8e58d53433ac776f6ccf8c2fdccbc097c25..fe92b904c55bed0703129cfe3697ef014ecac014
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -910,7 -893,15 +911,15 @@@ bytes respectively. Such letter suffixe
                        (mmio) or 32-bit (mmio32).
                        The options are the same as for ttyS, above.
  
 -      earlyprintk=    [X86,SH,BLACKFIN,ARM]
+               pl011,<addr>
+                       Start an early, polled-mode console on a pl011 serial
+                       port at the specified address. The pl011 serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+ 
+               smh     Use ARM semihosting calls for early console.
+ 
 +      earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
                        earlyprintk=vga
                        earlyprintk=efi
                        earlyprintk=xen

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/linux/clk-provider.h
Simple merge

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