diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 15:28:34 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 15:28:34 -0800 |
commit | e348031214d5dce67be93271433b27a93cba5b3f (patch) | |
tree | d8c9a8d61ef041a8a6629b34a6f2ebc19264d410 | |
parent | a56f3eb2cd72d4d678a63cf8cacf9d39aa8020f3 (diff) | |
parent | 89119f08354b628548118cacd686a7700372ad19 (diff) |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Here is a revert and two bugfixes for the I2C designware driver.
Please note that we are still hunting down a regression for the
i2c-octeon driver. While there is a fix pending, we have unclear
feedback from the testers currently. An rc8 would be quite helpful
for this case"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
Revert "i2c: designware: do not disable adapter after transfer"
i2c: designware: fix rx fifo depth tracking
i2c: designware: report short transfers