From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jan 2012 21:46:13 +0000 (-0800)
Subject: Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aa303f2c06c0f3b42190b7e56c16bc856b1a1b28;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux

* 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux:
  i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor
  i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH
  i2c-eg20t: modified the setting of transfer rate.
  i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number
  i2c: OMAP: Add DT support for i2c controller
  I2C: OMAP: NACK without STP
  I2C: OMAP: correct SYSC register offset for OMAP4
---

aa303f2c06c0f3b42190b7e56c16bc856b1a1b28