From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 May 2017 21:13:44 +0000 (-0700)
Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Tag: MMI-PSA29.97-13-9~5579
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=243bfd2c052dafe9e59fb0170434bfe706439156;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

243bfd2c052dafe9e59fb0170434bfe706439156