From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jun 2009 20:15:59 +0000 (-0700)
Subject: Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Tag: v2.6.31-rc1~348
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d32f60ed54351ebdea8ae6fbfa0d26e93de29252;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-ocores: Can add I2C devices to the bus
  i2c-s3c2410: move to using platform idtable to match devices
  i2c: OMAP3: Better noise suppression for fast/standard modes
  i2c: OMAP2/3: Fix scll/sclh calculations
  i2c: Blackfin TWI: implement I2C_FUNC_SMBUS_I2C_BLOCK functionality
  i2c: Blackfin TWI: fix transfer errors with repeat start
  i2c: Blackfin TWI: fix REPEAT START mode doesn't repeat
  i2c: Blackfin TWI: make sure we don't end up with a CLKDIV=0
---

d32f60ed54351ebdea8ae6fbfa0d26e93de29252