summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2015-06-30 14:28:52 +0100
committerGrant Likely <grant.likely@linaro.org>2015-06-30 14:28:52 +0100
commitbecfc3c86df963491ff1d5ffc6131a06af6bb851 (patch)
tree4b60fb962445166025724b84ce13e7f1762df8a1 /Documentation
parentce32f859646bab2ed724393398b90aa50149bb44 (diff)
parent0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff)
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'Documentation')
-rw-r--r--[-rwxr-xr-x]Documentation/devicetree/bindings/mfd/tps6507x.txt0
-rw-r--r--Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-falcon.txt (renamed from Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt)0
-rw-r--r--Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-xway.txt (renamed from Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt)0
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt1
4 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/tps6507x.txt b/Documentation/devicetree/bindings/mfd/tps6507x.txt
index 8fffa3c5ed40..8fffa3c5ed40 100755..100644
--- a/Documentation/devicetree/bindings/mfd/tps6507x.txt
+++ b/Documentation/devicetree/bindings/mfd/tps6507x.txt
diff --git a/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt b/Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-falcon.txt
index ac4da9fe07bd..ac4da9fe07bd 100644
--- a/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
+++ b/Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-falcon.txt
diff --git a/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt b/Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-xway.txt
index e89b4677567d..e89b4677567d 100644
--- a/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
+++ b/Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-xway.txt
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 80339192c93e..c400c95abc67 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -211,3 +211,4 @@ xillybus Xillybus Ltd.
xlnx Xilinx
zyxel ZyXEL Communications Corp.
zarlink Zarlink Semiconductor
+zii Zodiac Inflight Innovations