From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Dec 2009 02:27:51 +0000 (-0800)
Subject: Merge branch 'i2c-fixes' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.33-rc2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=431047166883101a93e9c713d54bd62466dd6ab9;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'i2c-fixes' of git://git.fluff.org/bjdooks/linux

* 'i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c-omap: OMAP3: Fix I2C lockup during timeout/error cases
  i2c-omap: Don't write IE state in unidle if 0
  i2c-bfin-twi: fix CLKDIV calculation
---

431047166883101a93e9c713d54bd62466dd6ab9