Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 May 2017 00:33:08 +0000 (17:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 May 2017 00:33:08 +0000 (17:33 -0700)
Pull i2c fix from Wolfram Sang:
 "A regression fix for I2C that would be great to have in rc2"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: designware: don't infer timings described by ACPI from clock rate


Trivial merge