From: Dmitry Torokhov Date: Thu, 15 Jan 2015 17:46:14 +0000 (-0800) Subject: Merge tag 'v3.19-rc4' into next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0c49cd295d42d0032af11d55e2140dbec11dc8d0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'v3.19-rc4' into next Merge with mainline to bring in the latest thermal and other changes. --- 0c49cd295d42d0032af11d55e2140dbec11dc8d0 diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index 9f18b4f5cf09,b1df0ad1306c..38c13dc19983 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@@ -48,9 -54,10 +54,11 @@@ epcos EPCOS A epfl Ecole Polytechnique Fédérale de Lausanne epson Seiko Epson Corp. est ESTeem Wireless Modems +ettus NI Ettus Research eukrea Eukréa Electromatique + everest Everest Semiconductor Co. Ltd. excito Excito + fcs Fairchild Semiconductor fsl Freescale Semiconductor GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. gef GE Fanuc Intelligent Platforms Embedded Systems, Inc.