tree 52ce8e32da45511ed0d1b7766a4cf230e8a19270
parent 538e7e96fd028e628d79f27c05a9a61ff9d01c7c
parent 8ee161ce5e0cfc689eb677f227a6248191165fac
author Linus Torvalds <torvalds@linux-foundation.org> 1331856875 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1331856875 -0700

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Pull i2c subsystem fixes from Jean Delvare.

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-algo-bit: Fix spurious SCL timeouts under heavy load
  i2c-core: Comment says "transmitted" but means "received"