commit | c7735471837b35a6205f6052a34ded3bdc1db505 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 29 11:07:02 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 29 11:07:02 2011 -0700 |
tree | c6f7a367d893f8194f624f321530fa010604d5c5 | |
parent | 78a3cc38f72cb0e6938ed8e796041d6d1beb8a28 [diff] | |
parent | cd823db8b1161ef0d756514d280715a576d65cc3 [diff] |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/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