]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge tag 'v4.8' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 14 Oct 2016 00:25:40 +0000 (17:25 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 14 Oct 2016 00:25:40 +0000 (17:25 -0700)
Sync up with mainline to bring in I2C host notify changes and other
updates.

1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/input/misc/max77693-haptic.c
drivers/input/serio/i8042.c
drivers/input/touchscreen/Kconfig

index 1457fd4d035f43c42b9641c0efe3b4fbd932b5f4,1992aa97d45ac8b0a9cfaefbaf5de40780c601ad..4e3d7d4e315e482998f9958fbdc1089bbc2c179c
@@@ -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.
Simple merge
diff --cc MAINTAINERS
index c232980e65958ce310d7d6a2d6c8d54b9f8cfc9a,f593300e310b80f4ca41c37dd9fc038003f42a08..90583657da49af2fe6f487c101a8dbdc7bf3d673
@@@ -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 <jeesw@melfas.com>
 +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 <eugenia@mellanox.com>
+ M:    Tariq Toukan <tariqt@mellanox.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
Simple merge
Simple merge
Simple merge