Merge branch 'dt/linus' into dt/next

Pull in the binding fixes so we don't have all the warnings.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 93a8364,0496773..7bd0a85
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -141,10 -141,11 +141,13 @@@ patternProperties
      description: ASIX Electronics Corporation
    "^aspeed,.*":
      description: ASPEED Technology Inc.
 +  "^asrock,.*":
 +    description: ASRock Inc.
    "^asus,.*":
      description: AsusTek Computer Inc.
+   "^atheros,.*":
+     description: Qualcomm Atheros, Inc. (deprecated, use qca)
+     deprecated: true
    "^atlas,.*":
      description: Atlas Scientific LLC
    "^atmel,.*":

diff --cc MAINTAINERS
Simple merge