From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Apr 2010 14:20:30 +0000 (-0700)
Subject: Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b7b6cf005b59ff5a4dba10338954c3dcfc75ef7b;p=openwrt%2Fstaging%2Fblogic.git

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
---

b7b6cf005b59ff5a4dba10338954c3dcfc75ef7b