From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Jul 2011 23:29:29 +0000 (-0700)
Subject: Merge branch 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v3.0-rc7~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1bb20a8365f6753e0f7b6e94981ca2b662bae13;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux

* 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux:
  i2c-bfin-twi: abort transfer is MEM bit is reset unexpectedly
  i2c-s3c2410: Remove useless break code
  i2c-s3c2410: Fix typo 'i2s' -> 'i2c'
  i2c: tegra: Assign unused slave address
---

f1bb20a8365f6753e0f7b6e94981ca2b662bae13