]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'i2c-fixes' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Dec 2009 02:27:51 +0000 (18:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Dec 2009 02:27:51 +0000 (18:27 -0800)
commit431047166883101a93e9c713d54bd62466dd6ab9
tree7ff0f2ce7ad273f01e0bc567f439e576b0ba8891
parentf51671fc85562cdcc64ca59fe92719863c7c25f1
parent57eb81b14e35a14df64ac3597bc90c26ce04a9b4
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