From: Dmitry Torokhov Date: Fri, 14 Oct 2016 00:25:40 +0000 (-0700) Subject: Merge tag 'v4.8' into next X-Git-Tag: v4.10-rc1~60^2^2~43 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a7126a25b4dfd07d61c699f724118275acc0c25;p=karo-tx-linux.git Merge tag 'v4.8' into next Sync up with mainline to bring in I2C host notify changes and other updates. --- 4a7126a25b4dfd07d61c699f724118275acc0c25 diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index 1457fd4d035f,1992aa97d45a..4e3d7d4e315e --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@@ -141,9 -153,9 +153,10 @@@ lsi LSI Corp. (LSI Logic lltc Linear Technology Corporation marvell Marvell Technology Group Ltd. maxim Maxim Integrated Products + meas Measurement Specialties mediatek MediaTek Inc. melexis Melexis N.V. +melfas MELFAS Inc. merrii Merrii Technology Co., Ltd. micrel Micrel Inc. microchip Microchip Technology Inc. diff --cc MAINTAINERS index c232980e6595,f593300e310b..90583657da49 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7155,15 -7643,8 +7643,15 @@@ F: Documentation/scsi/megaraid.tx F: drivers/scsi/megaraid.* F: drivers/scsi/megaraid/ +MELFAS MIP4 TOUCHSCREEN DRIVER +M: Sangwon Jee +W: http://www.melfas.com +S: Supported +F: drivers/input/touchscreen/melfas_mip4.c +F: Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt + MELLANOX ETHERNET DRIVER (mlx4_en) - M: Eugenia Emantayev + M: Tariq Toukan L: netdev@vger.kernel.org S: Supported W: http://www.mellanox.com