tree 02bb3727ae2442d0146558cfd02b231783b767d1
parent 3951dbf232e8500bef27f77437fd5d04b67cc6d1
parent abe41184abac487264a4904bfcff2d5500dccce6
author Linus Torvalds <torvalds@linux-foundation.org> 1531521269 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1531521269 -0700

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:

 - I2C core bugfix regarding bus recovery

 - driver bugfix for the tegra driver

 - typo correction

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: recovery: if possible send STOP with recovery pulses
  i2c: tegra: Fix NACK error handling
  i2c: stu300: use non-archaic spelling of failes