tree 0ffdc6949e885e2234933610296ad1f0e14b0515
parent 91ab9bf7c5322128d3b29c04393268658631e26a
parent 9cc11dee3ddf140e39b0088688bfe5ee45d63b41
author Linus Torvalds <torvalds@linux-foundation.org> 1288394157 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288394157 -0700

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

* 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux:
  i2c-intel-mid: Driver depends on PCI
  i2c-intel-mid: support for Moorestown and Medfield platform
  i2c-nomadik: fixup bus delays
  i2c-nomadik: support smbus emulation
  i2c-nomadik: dynamic clocking
  i2c-nomadik: documentation fixes
  i2c-s3c2410: Enable i2c clock only when doing some transfert