tree 1ee58483cb0f54acfc76a9800412f1cce77c0c57
parent 74a920139a0f1119c5a604cef0ce5d6f591dc782
parent 42df64b1f83fa9b786067a0b5a3aca0fbb2d8db8
author Linus Torvalds <torvalds@linux-foundation.org> 1271946030 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271946030 -0700

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

* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
  i2c-stu300: off by one issue
  i2c-pnx: Add stop conditions for end of transfer
  i2c-pnx: Limit maximum divider to 1023
  i2c-omap: fix OOPS in omap_i2c_unidle() during probe
  i2c-imx: fix error handling