diff options
| author | Linus Torvalds | 2020-10-10 16:09:12 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-10-10 16:09:12 -0700 |
| commit | da690031a5d6d50a361e3f19f3eeabd086a6f20d (patch) | |
| tree | 9bb1500867b6da627db3860701db974da8c4543d /kernel/up.c | |
| parent | 64b7f674c292207624b3d788eda2dde3dc1415df (diff) | |
| parent | f5b3f433641c543ebe5171285a42aa6adcdb2d22 (diff) | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel/up.c')
0 files changed, 0 insertions, 0 deletions