]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Oct 2010 17:55:54 +0000 (10:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Oct 2010 17:55:54 +0000 (10:55 -0700)
commitb10c4d40b3e413a908072acc53dea13e90c39aff
tree3e487da92de125a35b267d8f7ac98878b9fd1fa6
parent303a407002db563ae76d0f8a8ef0d8fe7954fcd4
parent7031307aefb6048377385dbb0af2dd43bb0190bb
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