From: Linus Torvalds Date: Fri, 14 Oct 2016 20:19:30 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=689f891c980949d3eb64f61651db53cb347e0a13;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input Pull some more input subsystem updates from Dmitry Torokhov: "An update to the ALPS driver to support the V8 protocol with touchstick, a change for i8042 to skip selftest on many Asus laptops which helps to keep their touchpads working after resume, and a couple other driver fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: i8042 - skip selftest on ASUS laptops Input: melfas_mip4 - add ic_name sysfs attribute Input: melfas_mip4 - add maintainer information Input: melfas_mip4 - add devicetree binding documentations Input: elantech - add Fujitsu Lifebook E556 to force crc_enabled Input: synaptics-rmi4 - fix error handling in I2C transport driver Input: synaptics-rmi4 - fix error handling in SPI transport driver Input: ALPS - add V8 protocol documentation Input: ALPS - set DualPoint flag for 74 03 28 devices Input: ALPS - allow touchsticks to report pressure Input: ALPS - handle 0-pressure 1F events Input: ALPS - add touchstick support for SS5 hardware Input: elantech - force needed quirks on Fujitsu H760 Input: elantech - fix Lenovo version typo --- 689f891c980949d3eb64f61651db53cb347e0a13 diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index caf0798908e2,1457fd4d035f..f0a48ea78659 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@@ -156,13 -137,13 +156,14 @@@ lantiq Lantiq Semiconducto lenovo Lenovo Group Ltd. lg LG Corporation linux Linux-specific binding -lsi LSI Corp. (LSI Logic) lltc Linear Technology Corporation +lsi LSI Corp. (LSI Logic) 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 146d1498aa01,c232980e6595..a452c404141d --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7829,8 -7155,15 +7829,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