tree 53a0c23db02bdaa7cf5948c4601debea836e9af5
parent dcbcb49155be1934d13887e50b9b728e153b15c3
parent 0bf9e1270b56b2376ba3b16d951cd0ed7c573f54
author Linus Torvalds <torvalds@linux-foundation.org> 1491070411 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1491070411 -0700

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

Pull i2c fixes from Wolfram Sang:
 "Two bugfixes from I2C, specifically the I2C mux section. Thanks to
  peda for collecting them"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mux: pca954x: Add missing pca9546 definition to chip_desc
  Revert "i2c: mux: pca954x: Add ACPI support for pca954x"