From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Apr 2009 15:45:12 +0000 (-0700)
Subject: Merge branch 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0e26da0f2200a2fb51844aaa43e365ea9dd5a93d;p=openwrt%2Fstaging%2Fblogic.git

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

* 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c: imx: Make disable_delay a per-device variable
  i2c: xtensa s6000 i2c driver
  powerpc/85xx: i2c-mpc: use new I2C bindings for the Socates board
  i2c: i2c-mpc: make I2C bus speed configurable
  i2c: i2c-mpc: use dev based printout function
  i2c: i2c-mpc: various coding style fixes
  i2c: imx: Add missing request_mem_region in probe()
  i2c: i2c-s3c2410: Initialise Samsung I2C controller early
  i2c-s3c2410: Simplify bus frequency calculation
  i2c-s3c2410: sda_delay should be in ns, not clock ticks
  i2c: iMX/MXC support
---

0e26da0f2200a2fb51844aaa43e365ea9dd5a93d