Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Jul 2010 20:32:55 +0000 (13:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Jul 2010 20:32:55 +0000 (13:32 -0700)
* '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


Trivial merge