tree 9c6dca32abb277f23a8eb99bfc39997cef42c6c7
parent ecd4b48a163b55d7eb4132617100b90d0d2768ec
parent 102b59c6d6d30fb6560177fd1ae8a34c4c163897
author Linus Torvalds <torvalds@linux-foundation.org> 1278880375 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278880375 -0700

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/mips: Fix error return codes from Sibyte i2c bus driver
  i2c: Fix probability check