From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Oct 2010 17:55:54 +0000 (-0700)
Subject: Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.36-rc7~24
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=b10c4d40b3e413a908072acc53dea13e90c39aff

Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux

* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
  i2c-s3c2410: fix calculation of SDA line delay
  i2c-davinci: Fix race when setting up for TX
  i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout
---

b10c4d40b3e413a908072acc53dea13e90c39aff