Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jun 2011 18:07:02 +0000 (11:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jun 2011 18:07:02 +0000 (11:07 -0700)
commitc7735471837b35a6205f6052a34ded3bdc1db505
treec6f7a367d893f8194f624f321530fa010604d5c5
parent78a3cc38f72cb0e6938ed8e796041d6d1beb8a28
parentcd823db8b1161ef0d756514d280715a576d65cc3
Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c/pca954x: Initialize the mux to disconnected state
  i2c-taos-evm: Fix log messages