Merge branch 'v4.4/topic/optee-lsk-mainline' into linux-linaro-lsk-v4.4

Author: Alex Shi

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)