Merge remote-tracking branch 'imx-mxs/for-next'

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index abc308083acb204c7625c5d53ed58d546c65f755,8c27e5c26620edb1560a5d6c4c0ebe5f378ef80d..285500407a437ffa1d319176255599b70428ed1f
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -123,9 -109,9 +123,10 @@@ stericsson        ST-Ericsso
  synology      Synology, Inc.
  ti    Texas Instruments
  tlm   Trusted Logic Mobility
+ toradex       Toradex AG
  toshiba       Toshiba Corporation
  toumaz        Toumaz
 +usi   Universal Scientifc Industrial Co., Ltd.
  v3    V3 Semiconductor
  via   VIA Technologies, Inc.
  voipac        Voipac Technologies s.r.o.

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/imx6qdl.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx6sl.dtsi
Simple merge