diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-13 17:23:40 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-13 17:23:40 -0700 |
| commit | 1134ca268e7387773cd6cf57aa82cc9d5e0f9127 (patch) | |
| tree | d1dec9989de703de689c240dd2cd157fe72f49a9 /MAINTAINERS | |
| parent | c758f96a8c346ac5a6822b521ec92308c5774381 (diff) | |
| parent | 930e19248e9b61da36c967687ca79c4d5f977919 (diff) | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.9 merge window.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 630151ff1b26..c232980e6595 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7155,6 +7155,13 @@ F: Documentation/scsi/megaraid.txt 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> L: netdev@vger.kernel.org |