diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-17 22:17:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-17 22:17:03 +0800 |
| commit | 91e52df3ad8b9c84c4f6f050e0f14127894dd8ce (patch) | |
| tree | 407b4d3c06dc8669ae805130e961a28a6a20055d | |
| parent | ca469a783a221185ddb19fe0cf69da21acfe1dd2 (diff) | |
| parent | 33bcec4fe0fac3ea9baadc2081fa13fda9feb029 (diff) | |
Merge branch 'v4.4/topic/optee-lsk-mainline' into linux-linaro-lsk-v4.4
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index fa9eba8dae07..569e9c89080f 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -127,7 +127,6 @@ lacie LaCie lantiq Lantiq Semiconductor lenovo Lenovo Group Ltd. lg LG Corporation -licheepi Lichee Pi linaro Linaro Limited linux Linux-specific binding lsi LSI Corp. (LSI Logic) |