]> git.baikalelectronics.ru Git - kernel.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)
commit676c991f742a01c99b81d1f48a82f6a04417d25c
tree3e487da92de125a35b267d8f7ac98878b9fd1fa6
parentba140ee43ecd31811092cc4fb1c97b7cb26d7c41
parentd6b8b7cd4e01168fc7c17cb90d57607acb4b1bb5
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