diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-07 11:24:03 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-07 11:24:03 -0800 |
commit | af6e7de0c7d1338c3e4224c764fbcb7e28064df9 (patch) | |
tree | 81001af79d9ef39bfd4d38e2b8a93b79ce89dba9 /MAINTAINERS | |
parent | 4b1d362db99d9233406cb7cfe35fc698ef92be25 (diff) | |
parent | 3b5f7f10ff6e6b66f553e12cc50d9bb751ce60ad (diff) | |
download | linux-stable-af6e7de0c7d1338c3e4224c764fbcb7e28064df9.tar.gz linux-stable-af6e7de0c7d1338c3e4224c764fbcb7e28064df9.tar.bz2 linux-stable-af6e7de0c7d1338c3e4224c764fbcb7e28064df9.zip |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Driver bugfixes for I2C.
Most of them are for the new mlxbf driver which got more exposure
after rc1. The sh_mobile patch should already have reached you during
the merge window, but I accidently dropped it. However, since it fixes
a problem with rebooting, it is still fine for rc3"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: designware: slave should do WRITE_REQUESTED before WRITE_RECEIVED
i2c: designware: call i2c_dw_read_clear_intrbits_slave() once
i2c: mlxbf: I2C_MLXBF should depend on MELLANOX_PLATFORM
i2c: mlxbf: Update author and maintainer email info
i2c: mlxbf: Update reference clock frequency
i2c: mlxbf: Remove unecessary wrapper functions
i2c: mlxbf: Fix resrticted cast warning of sparse
i2c: mlxbf: Add CONFIG_ACPI to guard ACPI function call
i2c: sh_mobile: implement atomic transfers
i2c: mediatek: move dma reset before i2c reset
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cd123d0a6a2d..3da6d8c154e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11163,7 +11163,7 @@ F: Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt F: drivers/input/touchscreen/melfas_mip4.c MELLANOX BLUEFIELD I2C DRIVER -M: Khalil Blaiech <kblaiech@mellanox.com> +M: Khalil Blaiech <kblaiech@nvidia.com> L: linux-i2c@vger.kernel.org S: Supported F: drivers/i2c/busses/i2c-mlxbf.c |