Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2018 22:34:29 +0000 (15:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2018 22:34:29 +0000 (15:34 -0700)
commitb80d575ac1a488fcd127b660db9baec61b3d8908
tree02bb3727ae2442d0146558cfd02b231783b767d1
parentf9f64eded62b596ab8e04aae87606e1a1b207a15
parentce735702bca57821d8e69d242a0e96d38b03ad9e
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