Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Oct 2020 23:09:12 +0000 (16:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Oct 2020 23:09:12 +0000 (16:09 -0700)
commitda690031a5d6d50a361e3f19f3eeabd086a6f20d
tree9bb1500867b6da627db3860701db974da8c4543d
parent64b7f674c292207624b3d788eda2dde3dc1415df
parentf5b3f433641c543ebe5171285a42aa6adcdb2d22
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Some more driver bugfixes for I2C. Including a revert - the updated
  series for it will come during the next merge window"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: owl: Clear NACK and BUS error bits
  Revert "i2c: imx: Fix reset of I2SR_IAL flag"
  i2c: meson: fixup rate calculation with filter delay
  i2c: meson: keep peripheral clock enabled
  i2c: meson: fix clock setting overwrite
  i2c: imx: Fix reset of I2SR_IAL flag