diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-06-30 09:28:52 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-06-30 09:28:52 -0400 |
| commit | becfc3c86df963491ff1d5ffc6131a06af6bb851 (patch) | |
| tree | 4b60fb962445166025724b84ce13e7f1762df8a1 /Documentation/devicetree | |
| parent | ce32f859646bab2ed724393398b90aa50149bb44 (diff) | |
| parent | 0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r--[-rwxr-xr-x] | Documentation/devicetree/bindings/mfd/tps6507x.txt | 0 | ||||
| -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.txt | 1 |
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. | |||
| 211 | xlnx Xilinx | 211 | xlnx Xilinx |
| 212 | zyxel ZyXEL Communications Corp. | 212 | zyxel ZyXEL Communications Corp. |
| 213 | zarlink Zarlink Semiconductor | 213 | zarlink Zarlink Semiconductor |
| 214 | zii Zodiac Inflight Innovations | ||