From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Mar 2010 23:41:48 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: upstream/snapshot3+hdmi~14978
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18020a0d8cccad0d3642219d6aef789420c04c1f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-scmi: Provide module aliases for automatic loading
  i2c-scmi: Support IBM SMBus CMI devices
  acpi: Support IBM SMBus CMI devices
---

18020a0d8cccad0d3642219d6aef789420c04c1f