Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
commit80519bc77b52729ca49b278b67d58715e38b85e9
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Jul 2010 20:32:55 +0000 (11 13:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Jul 2010 20:32:55 +0000 (11 13:32 -0700)
tree9c6dca32abb277f23a8eb99bfc39997cef42c6c7
parentecd4b48a163b55d7eb4132617100b90d0d2768ec
parent102b59c6d6d30fb6560177fd1ae8a34c4c163897
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/mips: Fix error return codes from Sibyte i2c bus driver
  i2c: Fix probability check