tree da5c2299763087c754d8a801f868ac9aaed82ab3
parent 90c69064c903f0993c7268c49670ad1f32030942
parent 69f81e86540716e68e98e401bb91f339d6a0d31f
author Linus Torvalds <torvalds@linux-foundation.org> 1310081369 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310081369 -0700

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