tree 7ff0f2ce7ad273f01e0bc567f439e576b0ba8891
parent f51671fc85562cdcc64ca59fe92719863c7c25f1
parent 57eb81b14e35a14df64ac3597bc90c26ce04a9b4
author Linus Torvalds <torvalds@linux-foundation.org> 1261621671 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1261621671 -0800

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