tree f9a6a8208159f0f120360a6d99a6bef4edb8d1ed
parent 8ab2ae655bfe384335c5b6b0d6041e0ddce26b00
parent dfa2ccc30e6556bd526f54f0e16fc9e5af4293cb
author Linus Torvalds <torvalds@linux-foundation.org> 1480698764 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1480698764 -0800

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

Pull i2c fix from Wolfram Sang:
 "Here is the revert for the regression of the i2c-octeon driver I
  mentioned last time. I wished for a bit more feedback, but all people
  working actively on it are in need of this patch, so here it goes"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  Revert "i2c: octeon: thunderx: Limit register access retries"