Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 May 2017 21:13:44 +0000 (14:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 May 2017 21:13:44 +0000 (14:13 -0700)
commit243bfd2c052dafe9e59fb0170434bfe706439156
treef13feed2f5655169d5b9fd8878324242ec05371c
parentb23afd384801711ab6dbccd259cc14cb09a1dcaf
parent83345d51a49a4b3f3b4a08a5db644dae438b0189
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Here are some bugfixes from I2C, especially removing a wrongly
  displayed error message for all i2c muxes"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: xgene: Set ACPI_COMPANION_I2C
  i2c: mv64xxx: don't override deferred probing when getting irq
  i2c: mux: only print failure message on error
  i2c: mux: reg: rename label to indicate what it does
  i2c: mux: reg: put away the parent i2c adapter on probe failure