tree 3a30929c0df451c9c45066a80b7a62fddcee609d
parent 24131a61ec8c2d83431cb818281d3c9db986ab08
parent 10ff4c5239a137abfc896ec73ef3d15a0f86a16a
author Linus Torvalds <torvalds@linux-foundation.org> 1461782085 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1461782085 -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 has one buildfix, one ABBA deadlock fix, and three simple 'add ID'
  patches"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: exynos5: Fix possible ABBA deadlock by keeping I2C clock prepared
  i2c: cpm: Fix build break due to incompatible pointer types
  i2c: ismt: Add Intel DNV PCI ID
  i2c: xlp9xx: add support for Broadcom Vulcan
  i2c: rk3x: add support for rk3228